rpms/libgnomedb/devel libgnomedb.spec,1.5,1.6

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/libgnomedb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1275

Modified Files:
	libgnomedb.spec 
Log Message:
Fix build errors


Index: libgnomedb.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libgnomedb.spec	27 Nov 2005 20:31:02 -0000	1.5
+++ libgnomedb.spec	28 Nov 2005 16:01:42 -0000	1.6
@@ -13,7 +13,8 @@
 BuildRequires:   pkgconfig >= 0.8, libgnomeui-devel >= 1.103.0
 BuildRequires:   gtk2-devel >= 1.3.6, libglade2-devel, scrollkeeper
 BuildRequires:   desktop-file-utils >= %{desktop_file_utils_version}
-BuildRequires:   libgda-devel >= 1.9.99
+BuildRequires:   libgda-devel >= 1:1.9.99
+BuildRequires:   gtk-doc
 
 Patch0: libgnomedb-1.2.0-desktop.patch
 
@@ -26,13 +27,9 @@
 Group:           Development/Libraries
 Requires:        %{name} = %{epoch}:%{version}-%{release}
 Requires:        pkgconfig >= 0.8
-Requires:        libgnomeui >= 1.103.0
 Requires:        libgnomeui-devel >= 1.103.0
-Requires:        libgda >= 1.2.0
-Requires:        libgda-devel >= 1.9.99
-Requires:        gtk2 >= 1.3.6
+Requires:        libgda-devel >= 1:1.9.99
 Requires:        gtk2-devel >= 1.3.6
-Requires:        libglade2
 Requires:        libglade2-devel
 
 %description devel
@@ -44,21 +41,22 @@
 %patch0 -p1 -b .desktop.patch
 
 %build
-%configure --disable-gtk-doc
+%configure
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-%makeinstall
+%makeinstall LIBGNOMEDB_DTDDIR=%{buildroot}%{_datadir}/libgnomedb/dtd
 %find_lang libgnomedb-3
 
-# rh#14932# install the .desktop into the canonical location
-desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --vendor=database --delete-original \
-  $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/database-properties.desktop
+desktop-file-install --dir %{buildroot}%{_datadir}/applications \
+  --vendor fedora --add-category X-Fedora --delete-original \
+  %{buildroot}%{_datadir}/applications/database-properties.desktop
 
 # remove unpackaged files
 rm -f %{buildroot}/%{_libdir}/*.la
+rm -f %{buildroot}/%{_libdir}/libgnomedb/plugins/*.a
+rm -f %{buildroot}/%{_libdir}/libgnomedb/plugins/*.la
 
 %post
 /sbin/ldconfig
@@ -79,24 +77,27 @@
 %clean
 rm -rf %{buildroot}
 
-%files -f libgnomedb-2.lang
+%files -f libgnomedb-3.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog README NEWS
 %{_bindir}/*
 %{_datadir}/mime-info/*
 %{_datadir}/pixmaps/libgnomedb
 %{_datadir}/applications/*.desktop
-%{_datadir}/gnome-db
+%{_datadir}/libgnomedb
 %{_libdir}/*.so.*
+%{_libdir}/libgnomedb
 %{_libdir}/libglade/2.0/*
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/libgnomedb-1.2
+%{_includedir}/libgnomedb-1.9
 %{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
+%{_datadir}/omf
+%{_datadir}/gtk-doc/html/libgnomedb
 
 
 %changelog