rpms/libgtk-java/devel .cvsignore, 1.21, 1.22 libgtk-java.spec, 1.67, 1.68 sources, 1.21, 1.22

[fedora-cvs-commits at redhat.com]

Author: skasal

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

Modified Files:
	.cvsignore libgtk-java.spec sources 
Log Message:
- Fix multilib conflicts in %%{docdir}. (#210566)
- New upstream version, contains only doc changes.
- Move development documentation to -devel.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	13 Aug 2006 18:34:48 -0000	1.21
+++ .cvsignore	17 Oct 2006 18:00:39 -0000	1.22
@@ -1 +1 @@
-libgtk-java-2.8.6.tar.bz2
+libgtk-java-2.8.7.tar.bz2


Index: libgtk-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/libgtk-java.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- libgtk-java.spec	5 Oct 2006 16:04:38 -0000	1.67
+++ libgtk-java.spec	17 Oct 2006 18:00:39 -0000	1.68
@@ -33,8 +33,6 @@
 BuildRequires:  %{java_pkg_prefix}glib-java-devel >= 0.2.6
 BuildRequires:  %{c_pkg_prefix}gtk2-devel >= 2.8.0
 BuildRequires:  java-devel >= 1.4.2, gcc-java >= 4.1.1, docbook-utils
-# FIXME: This was brought in automatically previously:
-BuildRequires:  antlr
 
 %description
 libgtk-java is a language binding that allows developers to write GTK
@@ -72,7 +70,8 @@
 (cd src/java && find . -name \*.java | sort | xargs zip -X -9 src.zip)
 touch -r ChangeLog src/java/src.zip
 
-mv doc/FAQ.html .
+# fix up the modification date of generated documentation
+find doc -type f -newer ChangeLog | xargs touch -r ChangeLog
 
 %install
 rm -rf %{buildroot}
@@ -104,7 +103,7 @@
 
 %files
 %defattr(-,root,root)
-%doc doc/api AUTHORS COPYING INSTALL README NEWS THANKS FAQ.html doc/examples
+%doc AUTHORS COPYING INSTALL README NEWS THANKS doc/FAQ.html
 %dir %{_includedir}/%{name_base}
 %{_includedir}/%{name_base}/*
 %{_libdir}/libgtkjava-*.so
@@ -115,6 +114,7 @@
 
 %files devel
 %defattr(-,root,root)
+%doc doc/api doc/examples
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/libgtkjava.so
 %{_libdir}/libgtkjni.so
@@ -122,6 +122,11 @@
 
 
 %changelog
+* Tue Oct 17 2006 Stepan Kasal <skasal at redhat.com> - 2.8.7-1
+- Fix multilib conflicts in %%{docdir}. (#210566)
+- New upstream version, contains only doc changes.
+- Move development documentation to -devel.
+
 * 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)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgtk-java/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	13 Aug 2006 18:34:48 -0000	1.21
+++ sources	17 Oct 2006 18:00:39 -0000	1.22
@@ -1 +1 @@
-230b62c4b69667245214788b43ea79af  libgtk-java-2.8.6.tar.bz2
+dd439b47c0b66f08077568bb1515568b  libgtk-java-2.8.7.tar.bz2