Another one that's been in RH/Fedora specfiles a while.
Remove timestamps from .po files to avoid multilib conflicts.
It ain't pretty but it works.
Signed-off-by: Eric Sandeen <[email protected]>
Addresses-Red-Hat-Bugzilla: #245653
Index: e2fsprogs-git/po/Makefile.in.in
===================================================================
--- e2fsprogs-git.orig/po/Makefile.in.in
+++ e2fsprogs-git/po/Makefile.in.in
@@ -118,10 +118,12 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcd
rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
else \
rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
- mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+ sed -f remove-potcdate.sed < $(DOMAIN).po > $(srcdir)/$(DOMAIN).pot && \
+ rm -f $(DOMAIN).po; \
fi; \
else \
- mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
+ sed -f remove-potcdate.sed < $(DOMAIN).po > $(srcdir)/$(DOMAIN).pot && \
+ rm -f $(DOMAIN).po; \
fi; \
}
On Mon, Nov 05, 2007 at 03:13:54PM -0600, Eric Sandeen wrote:
> Another one that's been in RH/Fedora specfiles a while.
> Remove timestamps from .po files to avoid multilib conflicts.
> It ain't pretty but it works.
The patch is missing remove-potcdate.sed; can you include it and
resend it please? Thanks!!
- Ted
>
> Signed-off-by: Eric Sandeen <[email protected]>
> Addresses-Red-Hat-Bugzilla: #245653
>
> Index: e2fsprogs-git/po/Makefile.in.in
> ===================================================================
> --- e2fsprogs-git.orig/po/Makefile.in.in
> +++ e2fsprogs-git/po/Makefile.in.in
> @@ -118,10 +118,12 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcd
> rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
> else \
> rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
> - mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
> + sed -f remove-potcdate.sed < $(DOMAIN).po > $(srcdir)/$(DOMAIN).pot && \
> + rm -f $(DOMAIN).po; \
> fi; \
> else \
> - mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
> + sed -f remove-potcdate.sed < $(DOMAIN).po > $(srcdir)/$(DOMAIN).pot && \
> + rm -f $(DOMAIN).po; \
> fi; \
> }
>
>
>
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
> the body of a message to [email protected]
> More majordomo info at http://vger.kernel.org/majordomo-info.html
Theodore Tso wrote:
> On Mon, Nov 05, 2007 at 03:13:54PM -0600, Eric Sandeen wrote:
>> Another one that's been in RH/Fedora specfiles a while.
>> Remove timestamps from .po files to avoid multilib conflicts.
>> It ain't pretty but it works.
>
> The patch is missing remove-potcdate.sed; can you include it and
> resend it please? Thanks!!
http://git.kernel.org/?p=fs/ext2/e2fsprogs.git;a=blob;f=po/remove-potcdate.sin
:)
-Eric
Eric Sandeen <[email protected]> writes:
> Another one that's been in RH/Fedora specfiles a while.
> Remove timestamps from .po files to avoid multilib conflicts.
> It ain't pretty but it works.
Sorry but that's insane.
Pos should not be updated on build. They should only be updated by
upstream developers instead. This enable translators to catch up and
prevent such hackery
Your spec file should not contain "make -C po update-po" in the first
place.
This is a fedora bug, not an e2fsprogs one IMHO.
You introduced your own multi-lib in the first place...
Thierry Vignaud wrote:
> Eric Sandeen <[email protected]> writes:
>
>> Another one that's been in RH/Fedora specfiles a while.
>> Remove timestamps from .po files to avoid multilib conflicts.
>> It ain't pretty but it works.
>
> Sorry but that's insane.
>
> Pos should not be updated on build. They should only be updated by
> upstream developers instead. This enable translators to catch up and
> prevent such hackery
Hrm, good point.
> Your spec file should not contain "make -C po update-po" in the first
> place.
> This is a fedora bug, not an e2fsprogs one IMHO.
>
> You introduced your own multi-lib in the first place...
Apparently there was some issue with this, once upon a time, which
resulted in our rpms needing to update the po files... I guess I need to
do a bit more code archeology / research. It looks like sct added this
when the pkg updated to 1.36, though there is no comment about why.
I inherited lots of history when I got e2fsprogs, so please forgive me
as I work through it. :)
One question though, then - what is the existing timestamp removal
mechanism for, then?
-Eric
On Tue, Nov 06, 2007 at 08:33:33AM -0600, Eric Sandeen wrote:
> Apparently there was some issue with this, once upon a time, which
> resulted in our rpms needing to update the po files... I guess I need to
> do a bit more code archeology / research. It looks like sct added this
> when the pkg updated to 1.36, though there is no comment about why.
One potential reason could be that we are using ancient libintl files,
and there was some compatibility problem --- although I can't think of
a reason that would require updating the po files.
I know there is currently an issue on Debian because the po files are
getting intstalled in the wrong locations and the gettext shared
libraries are looking for them somewhere else, but I only vaguely
recall what was going on. I had only enough time to start doing a
quick investigation to see why the translation files were getting
ignored, and didn't have time to try to fix it.
If someone would like to update the po directory and the configure.in
hunks for -po to something less antediluvian, patches would be greatly
appreciated....
- Ted