rpms/libgconf-java/FC-6 libgconf-java.spec,1.39,1.40

[fedora-cvs-commits at redhat.com]

Author: skasal

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

Modified Files:
	libgconf-java.spec 
Log Message:
- Fix multilib conflicts in %%{docdir}. (#210567)
- Move development documentation to -devel.



Index: libgconf-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/FC-6/libgconf-java.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- libgconf-java.spec	5 Oct 2006 17:34:49 -0000	1.39
+++ libgconf-java.spec	17 Oct 2006 18:27:20 -0000	1.40
@@ -3,7 +3,7 @@
 Summary:	Java bindings for GConf
 Name:		%{name_base}
 Version:	2.12.4
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -48,6 +48,9 @@
 (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}
 
@@ -78,19 +81,24 @@
 
 %files
 %defattr(-,root,root)
-%doc doc/api AUTHORS COPYING doc/examples NEWS README
+%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)