Re: [gnome-db] [PATCH] - Patch libgnomedb.spec.in for 1.1.99

[David Hollis <dhollis davehollis com>]

On Mon, 2004-10-18 at 12:57 +0200, Rodrigo Moya wrote:
> On Wed, 2004-10-13 at 09:12 -0400, David Hollis wrote:
> > On Wed, 2004-10-13 at 12:52 +0200, Rodrigo Moya wrote:
> > > On Tue, 2004-10-12 at 18:48 -0400, David Hollis wrote:
> > > > This patch incorporates fixes that RedHat added for libgnomedb as well as
> > > > including changes made during the 1.1.x series.  Please apply so RPMS will
> > > > build properly with the upcoming 1.2 release.
> > > > 
> > > why do we need to add an Epoch to the version?
> > RedHat added that.  I'm not certain exactly why unfortunately.
> > 
> if we don't know what it's for, I guess it's better to not use it. It
> prepends a $epoch to all version numbers, so the package would be
> 1-1.2-release, which is not what we want.
> 
> So, could you please provide a new patch without the epoch stuff and
> with my other comment fixed, please?
> 
> thanks

Sorry to take so long on this, I'm out of the country and on extremely
slow Internet.  I removed the Epoch, added in the gtk-doc, not sure why
RH had disabled it.

-- 
David Hollis <dhollis davehollis com>

--- libgnomedb.spec.in.orig	2004-10-21 23:49:44.843131296 +0300
+++ libgnomedb.spec.in	2004-10-21 23:50:42.358387648 +0300
@@ -18,6 +18,7 @@
 BuildRequires:   gtk2-devel >= 1.3.6
 BuildRequires:   libbonoboui-devel
 BuildRequires:   libglade2-devel
+BuildRequires:   scrollkeeper
 
 %description
 libgnomedb is a library that eases the task of writing
@@ -26,7 +27,7 @@
 %package devel
 Summary:         Development libraries and header files for libgnomedb.
 Group:           Development/Libraries
-Requires:        %name = %{version}
+Requires:	 %{name} = %{version}-%{release}
 Requires:        pkgconfig >= 0.8
 Requires:        libgnomeui >= 1.103.0
 Requires:        libgnomeui-devel >= 1.103.0
@@ -44,10 +45,10 @@
 or compile programs that use libgda.
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q
 
 %build
-%configure --disable-gtk-doc
+%configure
 make %{?_smp_mflags}
 
 %install
@@ -82,27 +83,35 @@
 %{_datadir}/control-center-2.0/capplets/*
 %{_datadir}/mime-info/*
 %{_datadir}/pixmaps/libgnomedb
+%{_datadir}/gnome-db
 %{_libdir}/*.so.*
-%{_libdir}/bonobo/monikers/*.so
-%{_libdir}/bonobo/monikers/*.a
-%{_libdir}/bonobo/monikers/*.la
-%{_libdir}/bonobo/servers/*
 %{_libdir}/libglade/2.0/*
-%{_libexecdir}/*
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*
 
 %files devel
 %defattr(-,root,root)
 %doc %{_datadir}/gtk-doc/html/libgnomedb
 %{_datadir}/omf/*
-%{_includedir}/libgnomedb
+%dir %{_includedir}/libgnomedb-1.1/
+%{_includedir}/libgnomedb-1.1/*
 %{_libdir}/*.a
 %{_libdir}/*.la
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 
-
 %changelog
+* Tue Oct 12 2004 David Hollis <dhollis davehollis com> 1.1.99-1
+- Update to 1.1.99
+- Merge RH spec changes
+
+* Fri Oct 08 2004 Caolan McNamara <caolanm redhat com> 1.0.4-2
+- #rh135044# BuildRequires
+
+* Thu Aug 12 2004 Caolan McNamara <caolanm redhat com>
+- Initial Red Hat import
+- patch for missing break statement
+- fixup devel package requirement pickiness
+
 * Tue Jan 28 2003 Yanko Kaneti <yaneti delcera com>
 - Package and add the omf/scrollkeeper bits.
 - --disable-gtk-doc to configure because the generated docs are in the tarball