rpms/gettext/devel gettext.spec,1.66,1.67

[fedora-cvs-commits at redhat.com]

Author: petersen

Update of /cvs/dist/rpms/gettext/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16792

Modified Files:
	gettext.spec 
Log Message:
- protect install-info in devel %%post and %%preun too (Ville Skytta, #223689)
- forward port fix to reset of timestamp of examples ChangeLog for
  brp-java-repack-jars libintl.jar multilib conflict (#205207)



Index: gettext.spec
===================================================================
RCS file: /cvs/dist/rpms/gettext/devel/gettext.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- gettext.spec	22 Jan 2007 00:42:38 -0000	1.66
+++ gettext.spec	1 Feb 2007 03:13:20 -0000	1.67
@@ -1,7 +1,7 @@
 Summary: GNU libraries and utilities for producing multi-lingual messages.
 Name: gettext
 Version: 0.16.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL/LGPL
 Group: Development/Tools
 Source: ftp://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
@@ -52,12 +52,11 @@
 
 
 %build
-[ -f  %{_datadir}/automake/depcomp ] && cp -f %{_datadir}/automake/{depcomp,ylwrap} . || :
+[ -f  %{_datadir}/automake/depcomp ] && cp -f %{_datadir}/automake/{depcomp,ylwrap} .
 
-export JAVAC='gcj -C'
-export JAR='fastjar'
+export JAR=fastjar
 %configure --without-included-gettext --enable-nls \
-	--enable-shared --with-pic-=yes --disable-csharp
+	--enable-shared --with-pic-=yes --disable-csharp --enable-java
 make
 
 
@@ -101,6 +100,11 @@
 rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/libasprintf
 rm -r ${RPM_BUILD_ROOT}%{_datadir}/doc/gettext
 
+# set examples ChangeLog timestamp for brp-java-repack-jars
+for i in `find ${RPM_BUILD_ROOT} examples -newer ChangeLog -type f -name ChangeLog`; do
+  touch -r ChangeLog  $i
+done
+
 # remove unpackaged files from the buildroot
 rm -r ${RPM_BUILD_ROOT}%{_datadir}/emacs
 rm ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
@@ -132,12 +136,12 @@
 
 %post devel
 /sbin/ldconfig
-%{install_info} %{_infodir}/autosprintf.info %{_infodir}/dir
+%{install_info} %{_infodir}/autosprintf.info %{_infodir}/dir || :
 
 
 %preun devel
 if [ "$1" = 0 ]; then
-    %{remove_install_info} %{_infodir}/autosprintf.info %{_infodir}/dir
+    %{remove_install_info} %{_infodir}/autosprintf.info %{_infodir}/dir || :
 fi
 
 
@@ -173,6 +177,7 @@
 #%config %{_libdir}/charset.alias
 %{_libdir}/%{name}
 %exclude %{_libdir}/%{name}/gnu.gettext.*
+#%%{_datadir}/%{name}/libintl.jar
 
 %files devel
 %defattr(-,root,root)
@@ -206,6 +211,11 @@
 
 
 %changelog
+* Thu Feb  1 2007 Jens Petersen <petersen at redhat.com> - 0.16.1-4
+- protect install-info in devel %%post and %%preun too (Ville Skyttä, #223689)
+- forward port fix to reset of timestamp of examples ChangeLog for
+  brp-java-repack-jars libintl.jar multilib conflict (#205207)
+
 * Mon Jan 22 2007 Jens Petersen <petersen at redhat.com> - 0.16.1-3
 - protect install-info in %%post and %%preun (Ville Skyttä, #223689)
 
@@ -221,8 +231,8 @@
 
 * Fri Oct 27 2006 Jens Petersen <petersen at redhat.com> - 0.15-1
 - update to 0.15 release
-- mkinstalldirs is gone
-- libintl.jar replaced by javaversion.class (#205207)
+- mkinstalldirs and libintl.jar are gone
+- javaversion.class added
 
 * Mon Oct  2 2006 Jens Petersen <petersen at redhat.com> - 0.14.6-3
 - buildrequire zip and unzip to fix libintl.jar multilib conflict (#205207)