rpms/libgconf-java/FC-5 libgconf-java.spec,1.25,1.26

[fedora-cvs-commits at redhat.com]

Author: skasal

Update of /cvs/dist/rpms/libgconf-java/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv19370

Modified Files:
	libgconf-java.spec 
Log Message:
Synch with devel.


Index: libgconf-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/FC-5/libgconf-java.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- libgconf-java.spec	15 Aug 2006 13:29:08 -0000	1.25
+++ libgconf-java.spec	31 Oct 2006 09:33:11 -0000	1.26
@@ -3,7 +3,7 @@
 Summary:	Java bindings for GConf
 Name:		%{name_base}
 Version:	2.12.4
-Release: 	2%{?dist}
+Release: 	5%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -44,13 +44,12 @@
 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
+
+# fix up the modification date of generated documentation
+find doc -type f -newer ChangeLog | xargs touch -r ChangeLog
 
 %install
 rm -rf %{buildroot}
@@ -62,36 +61,52 @@
         mv $RPM_BUILD_ROOT%{_docdir}/%{name_base}-%{version} $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 fi
 
+# Remove unpackaged files:
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+
 # install the src zip and make a sym link
 jarversion=$(echo -n %{version} | cut -d . -f -2)
-jarname=$(echo -n %{name} | 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
-/sbin/ldconfig
 
-%postun
-/sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root)
-%doc doc/api AUTHORS COPYING doc/examples NEWS README
-%{_libdir}/*so*
-%{_libdir}/*la
+%doc AUTHORS COPYING NEWS README
+%{_libdir}/libgconfjava-*.so
+%{_libdir}/libgconfjni-*.so
 %{_datadir}/java/*.jar
 
 %files devel
 %defattr(-,root,root)
+%doc doc/api doc/examples
 %{_libdir}/pkgconfig/*.pc
+%{_libdir}/libgconfjava.so
+%{_libdir}/libgconfjni.so
 %{_datadir}/java/*.zip
 
 %changelog
+* Tue Oct 17 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-5
+- Fix multilib conflicts in %%{docdir}. (#210567)
+- Move development documentation to -devel.
+
+* Thu Oct  5 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-4
+- Fix the source packing: preserve source timestamps and prevent multilib
+  conflicts. (#192701)
+
+* Wed Aug 30 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-3
+- Do not pack the *.la files.
+- Move the *.so symlinks to -devel.
+
 * Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-2
 - Fix the description of the -devel package.