rpms/libgnome/devel libgnome.spec,1.131,1.132

Bill Nottingham notting at fedoraproject.org
Thu Oct 23 17:34:03 UTC 2008


Author: notting

Update of /cvs/extras/rpms/libgnome/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23589

Modified Files:
	libgnome.spec 
Log Message:
sed the generated pot file to avoid multilib conflicts, as that line gets put
in the .po file headers. Yuk. (#468161)



Index: libgnome.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnome/devel/libgnome.spec,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- libgnome.spec	21 Oct 2008 14:53:04 -0000	1.131
+++ libgnome.spec	23 Oct 2008 17:33:32 -0000	1.132
@@ -14,7 +14,7 @@
 Summary: GNOME base library
 Name: libgnome
 Version: 2.24.1
-Release: 5%{?dist}
+Release: 6%{?dist}
 URL: http://www.gnome.org
 Source0: http://download.gnome.org/sources/libgnome/2.24/%{name}-%{version}.tar.bz2
 Source1: desktop_gnome_peripherals_monitor.schemas
@@ -135,13 +135,12 @@
 grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep
 mv POTFILES.keep POTFILES.in
 intltool-update --pot
+sed -ie 's|POT-Creation-Date.*|POT-Creation-Date: 2008-10-01 00:00-0400\\n"|g' %{po_package}.pot
 for p in *.po; do
   msgmerge $p %{po_package}.pot > $p.out
   msgfmt -o `basename $p .po`.gmo $p.out
-  touch -r POTFILES.skip `basename $p .po`.gmo
 done
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
@@ -210,6 +209,9 @@
 %{_datadir}/gtk-doc/html/*
 
 %changelog
+* Thu Oct 23 2008 Bill Nottingham <notting at redhat.com> - 2.24.1-6
+- sed the pot file to avoid multilib issues (#468161)
+
 * Tue Oct 21 2008 Ray Strode <rstrode at redhat.com> - 2.24.1-5
 - Default to "solar" instead of "waves"
 




More information about the fedora-extras-commits mailing list