rpms/libgtk-java/devel libgtk-java.spec,1.65,1.66

[fedora-cvs-commits at redhat.com]

Author: skasal

Update of /cvs/dist/rpms/libgtk-java/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv20006

Modified Files:
	libgtk-java.spec 
Log Message:
- Fix the source packing: preserve source timestamps and prevent multilib
  conflicts. (#192709)



Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- libgtk-java.spec	30 Aug 2006 20:22:44 -0000	1.65
+++ libgtk-java.spec	5 Oct 2006 13:38:39 -0000	1.66
@@ -10,7 +10,7 @@
 %{!?c_pkg_prefix: %define c_pkg_prefix %{nil}}
 %{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
 
-# FIXME: temporary workaround to fix bug #197460:
+# FIXME: temporary workaround until bug #202210 is fixed:
 %define __perl_provides %{nil}
 
 %define	name_base 	libgtk-java
@@ -18,7 +18,7 @@
 Summary:	Java bindings for GTK+
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	2.8.6
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -68,17 +68,11 @@
 make %{?_smp_mflags}
 
 # pack up the java source
-jarversion=$(echo -n %{version} | cut -d . -f -2)
-jarname=$(echo -n %{name_base} | cut -d - -f 1 | sed "s/lib//")
-zipfile=$PWD/$jarname$jarversion-src-%{version}.zip
-pushd src/java
-find -name \*.java | xargs touch --date=1/1/1970
-zip -X -9 -r $zipfile . -i \*.java
-popd
-
-pushd doc
-  mv FAQ.html ..
-popd
+find src/java -name \*.java -newer ChangeLog | xargs touch -r ChangeLog
+(cd src/java && find . -name \*.java | sort | xargs zip -X -9 src.zip)
+touch -r ChangeLog src/java/src.zip
+
+mv doc/FAQ.html .
 
 %install
 rm -rf %{buildroot}
@@ -95,11 +89,11 @@
 
 # install the src zip and make a sym link
 jarversion=$(echo -n %{version} | cut -d . -f -2)
-jarname=$(echo -n %{name_base} | cut -d - -f 1 | sed "s/lib//")
-install -m 644 $jarname$jarversion-src-%{version}.zip $RPM_BUILD_ROOT%{_datadir}/java/
-pushd $RPM_BUILD_ROOT%{_datadir}/java
-ln -sf $jarname$jarversion-src-%{version}.zip $jarname$jarversion-src.zip
-popd
+jarname=$(echo -n %{name_base} | sed 's/-.*//;s/^lib//')
+zipfile=$jarname$jarversion-src-%{version}.zip
+install -m 644 src/java/src.zip $RPM_BUILD_ROOT%{_datadir}/java/$zipfile
+(cd $RPM_BUILD_ROOT%{_datadir}/java &&
+  ln -sf $zipfile $jarname$jarversion-src.zip)
 
 
 %post -p /sbin/ldconfig
@@ -128,6 +122,10 @@
 
 
 %changelog
+* Thu Oct  5 2006 Stepan Kasal <skasal at redhat.com> - 2.8.6-4
+- Fix the source packing: preserve source timestamps and prevent multilib
+  conflicts. (#192709)
+
 * Wed Aug 30 2006 Stepan Kasal <skasal at redhat.com> - 2.8.6-3
 - Do not pack the *.la files.
 - Move the *.so symlinks to -devel.