rpms/libgconf-java/FC-5 .cvsignore, 1.12, 1.13 libgconf-java.spec, 1.24, 1.25 sources, 1.13, 1.14

[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-serv23905

Modified Files:
	.cvsignore libgconf-java.spec sources 
Log Message:
- BuildRequire docbook-utils and java-1.4.2-gcj-compat-devel
- New upstream version.
- Use the %{?dist} tag.
- Use `make %{?_smp_mflags}'.
- Move the pkgconfig file to the devel package.
- The -devel subpackage now requires several -devel packages.
- Update requires and buildrequires.
- Remove macros c_pkg_prefix and java_pkg_prefix and the code for optional
  instalation under /opt/frysk prefix.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	12 Jul 2006 15:56:24 -0000	1.12
+++ .cvsignore	15 Aug 2006 13:29:08 -0000	1.13
@@ -1 +1 @@
-libgconf-java-2.12.3.tar.bz2
+libgconf-java-2.12.4.tar.bz2


Index: libgconf-java.spec
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/FC-5/libgconf-java.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- libgconf-java.spec	12 Jul 2006 15:56:24 -0000	1.24
+++ libgconf-java.spec	15 Aug 2006 13:29:08 -0000	1.25
@@ -1,21 +1,9 @@
-# install these packages into /opt if we have a prefix defined for the
-# java packages
-%{?java_pkg_prefix: %define _prefix /opt/frysk }
-%{?java_pkg_prefix: %define _sysconfdir %{_prefix}/etc }
-%{?java_pkg_prefix: %define _localstatedir %{_prefix}/var }
-%{?java_pkg_prefix: %define _infodir %{_prefix}/share/info }
-%{?java_pkg_prefix: %define _mandir %{_prefix}/share/man }
-%{?java_pkg_prefix: %define _defaultdocdir %{_prefix}/share/doc }
-
-%{!?c_pkg_prefix: %define c_pkg_prefix %{nil}}
-%{!?java_pkg_prefix: %define java_pkg_prefix %{nil}}
-
 %define	name_base	libgconf-java
 
 Summary:	Java bindings for GConf
-Name:		%{java_pkg_prefix}%{name_base}
-Version:	2.12.3
-Release: 	1
+Name:		%{name_base}
+Version:	2.12.4
+Release: 	2%{?dist}
 License:	LGPL
 Group:		Development/Libraries
 URL:		http://java-gnome.sourceforge.net
@@ -23,9 +11,16 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Requires:	GConf2 >= 2.11.2
-Requires:	%{java_pkg_prefix}libgtk-java >= 2.8.4
-BuildRequires:	%{java_pkg_prefix}libgtk-java-devel >= 2.8.4
+Requires:	glib-java >= 0.2.6
+BuildRequires:	glib-java-devel >= 0.2.6
 BuildRequires:  GConf2-devel >= 2.11.2, gcc-java >= 4.1.1
+BuildRequires:  docbook-utils
+# We need javadoc:
+BuildRequires:  java-1.4.2-gcj-compat-devel
+
+# Currently, the configure script checks for libgtk-java.
+# See gnome bugs #347254, #350931
+BuildRequires:	libgtk-java-devel >= 2.8.4
 
 %description
 libgconf-java is a language binding that allows developers to use the
@@ -35,23 +30,18 @@
 Summary:        Compressed Java source files for %{name}.
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:	GConf2-devel
+Requires:	glib-java-devel
 
 %description    devel
-Compressed Java source for %{name}. This is useful if you are developing
-applications with IDEs like Eclipse.
+Development part of %{name}.
 
 %prep
 %setup -q -n %{name_base}-%{version}
 
 %build
-# if either the C or Java packages has a prefix declared, then we will
-# add /opt/frysk/lib/pkgconfig to the pkgconfig path
-if  [  'x%{java_pkg_prefix}' != 'x' ] || [ 'x%{c_pkg_prefix}' != 'x' ]; then
-        export PKG_CONFIG_PATH=/opt/frysk/lib/pkgconfig
-fi
-
 %configure
-make
+make %{?_smp_mflags}
 
 # pack up the java source
 jarversion=$(echo -n %{version} | cut -d . -f -2)
@@ -65,7 +55,7 @@
 %install
 rm -rf %{buildroot}
 
-make DESTDIR=$RPM_BUILD_ROOT install
+make %{?_smp_mflags} DESTDIR=$RPM_BUILD_ROOT install
 
 # rename doc dir to reflect package rename, if the names differ
 if [ 'x%{name_base}' != 'x%{name_base}' ] ; then
@@ -94,14 +84,34 @@
 %doc doc/api AUTHORS COPYING doc/examples NEWS README
 %{_libdir}/*so*
 %{_libdir}/*la
-%{_libdir}/pkgconfig/*
 %{_datadir}/java/*.jar
 
 %files devel
 %defattr(-,root,root)
+%{_libdir}/pkgconfig/*.pc
 %{_datadir}/java/*.zip
 
 %changelog
+* Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-2
+- Fix the description of the -devel package.
+
+* Sun Aug 13 2006 Stepan Kasal <skasal at redhat.com> - 2.12.4-1
+- New upstream version.
+- Use the %%{?dist} tag.
+- Use `make %%{?_smp_mflags}'.
+- The -devel subpackage now requires several -devel packages.
+- Update requires and buildrequires.
+- Remove macros c_pkg_prefix and java_pkg_prefix and the code for optional
+  instalation under /opt/frysk prefix.
+
+* Sun Jul 23 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 2.12.3-3
+- Bump release number. (dist-fc6-java)
+
+* Sun Jul 16 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-2
+- Move the pkgconfig file to the devel package.
+- BuildRequire docbook-utils and java-1.4.2-gcj-compat-devel
+- BuildReq gtk2-devel (a temporary workaround).
+
 * Wed Jul 12 2006 Stepan Kasal <skasal at redhat.com> - 2.12.3-1
 - New upstream version.
 - Build on s390x again.


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/libgconf-java/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	12 Jul 2006 15:56:24 -0000	1.13
+++ sources	15 Aug 2006 13:29:08 -0000	1.14
@@ -1 +1 @@
-0498ac34333ddfc24b0b1b2e33ac8315  libgconf-java-2.12.3.tar.bz2
+ac9f8e35999cedcb2e9009032f0fe256  libgconf-java-2.12.4.tar.bz2