rpms/cairo-java/devel cairo-java.spec,1.39,1.40

[fedora-cvs-commits at redhat.com]

Author: skasal

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

Modified Files:
	cairo-java.spec 
Log Message:
- Fix a typo: do not put the source zip to the base package.
- Fix the source packing: preserve source timestamps and prevent multilib
  conflicts. (#192663)



Index: cairo-java.spec
===================================================================
RCS file: /cvs/dist/rpms/cairo-java/devel/cairo-java.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- cairo-java.spec	30 Aug 2006 19:59:32 -0000	1.39
+++ cairo-java.spec	5 Oct 2006 13:29:50 -0000	1.40
@@ -15,7 +15,7 @@
 Summary:	Java bindings for the Cairo library
 Name:		%{java_pkg_prefix}%{name_base}
 Version:	1.0.5
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -62,13 +62,9 @@
 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
+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
 
 
 %install
@@ -86,11 +82,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
@@ -104,7 +100,7 @@
 %doc doc/api AUTHORS ChangeLog COPYING INSTALL README NEWS 
 %{_libdir}/libcairojava-*.so
 %{_libdir}/libcairojni-*.so
-%{_datadir}/java/*
+%{_datadir}/java/*.jar
 
 %files devel
 %defattr(-,root,root)
@@ -115,6 +111,11 @@
 
 
 %changelog
+* Thu Oct  5 2006 Stepan Kasal <skasal at redhat.com> - 1.0.5-3
+- Fix a typo: do not put the source zip to the base package.
+- Fix the source packing: preserve source timestamps and prevent multilib
+  conflicts. (#192663)
+
 * Wed Aug 30 2006 Stepan Kasal <skasal at redhat.com> - 1.0.5-2
 - Do not pack the *.la files.
 - Move the *.so symlinks to -devel.