Author: qboosh Date: Sat Jun 2 15:49:37 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- fixed packages split:
- library ui data, icons, schemas moved to main
- libglade2 module moved to main (useful for apps using libgnomedb,
not used by gnome-database-properties)
- scrollkeeper .omf file moved to -apidocs (references gtk-doc)
---- Files affected:
SPECS:
libgnomedb.spec (1.63 -> 1.64)
---- Diffs:
================================================================
Index: SPECS/libgnomedb.spec
diff -u SPECS/libgnomedb.spec:1.63 SPECS/libgnomedb.spec:1.64
--- SPECS/libgnomedb.spec:1.63 Sat Jun 2 12:53:06 2007
+++ SPECS/libgnomedb.spec Sat Jun 2 17:49:30 2007
@@ -10,10 +10,13 @@
Source0:
http://ftp.gnome.org/pub/gnome/sources/libgnomedb/1.2/%{name}-%{version}.tar.bz2
# Source0-md5: cf8b1eb3aa3e7b18f46bc9bc9335dca7
Patch0: %{name}-desktop.patch
+Patch1: %{name}-gtk-doc.patch
URL: http://www.gnome-db.org/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1:1.8
BuildRequires: GConf2-devel
+# only checked for, not used
+#BuildRequires: evolution-data-server-devel >= 1.0
BuildRequires: gettext-devel
BuildRequires: gnome-common >= 2.12.0
BuildRequires: gtk+2-devel >= 2:2.10.1
@@ -22,11 +25,13 @@
BuildRequires: intltool
BuildRequires: libgda-devel >= 1:1.2.3
BuildRequires: libglade2-devel >= 1:2.6.0
-BuildRequires: libgnomeui-devel >= 2.15.91
+BuildRequires: libgnomeui-devel >= 2.16.0
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.197
BuildRequires: scrollkeeper
+Requires(post): /sbin/ldconfig
+Requires(post,preun): GConf2 >= 2.14.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -41,9 +46,11 @@
Summary(pl.UTF-8): Dla programistów widgetu GNOME-DB
Group: X11/Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: gtk+2-devel >= 2:2.10.1
Requires: gtksourceview-devel >= 1.7.2
Requires: libgda-devel >= 1:1.2.3
-Requires: libgnomeui-devel >= 2.15.91
+Requires: libglade2-devel >= 1:2.6.0
+Requires: libgnomeui-devel >= 2.16.0
%description devel
libgnomedb is a library that eases the task of writing GNOME database
@@ -69,6 +76,7 @@
Summary: libgnomedb API documentation
Summary(pl.UTF-8): Dokumentacja API libgnomedb
Group: Documentation
+Requires(post,postun): scrollkeeper
Requires: gtk-doc-common
%description apidocs
@@ -82,8 +90,6 @@
Summary(pl.UTF-8): Właściwości dostępu do baz danych
Group: X11/Applications
Requires: %{name} = %{epoch}:%{version}-%{release}
-Requires(post,preun): GConf2 >= 2.14.0
-Requires(post,postun): scrollkeeper
%description -n gnome-database-access-properties
Allows to configure database access properties in GNOME.
@@ -94,6 +100,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__intltoolize}
@@ -113,13 +120,10 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT \
- HTML_DIR=%{_gtkdocdir} \
- desktopdir=%{_desktopdir} \
- omf_dest_dir=%{_omf_dest_dir}/%{name} \
- pkgconfigdir=%{_pkgconfigdir}
+ desktopdir=%{_desktopdir}
-# no static modules and *.la for bonobo or glade modules
-rm -f $RPM_BUILD_ROOT%{_libdir}/{bonobo/monikers,libglade/2.0}/*.{la,a}
+# no static modules and *.la for glade modules
+rm -f $RPM_BUILD_ROOT%{_libdir}/libglade/2.0/*.{la,a}
ln -sf %{_pixmapsdir}/libgnomedb/gnome-db.png \
$RPM_BUILD_ROOT%{_pixmapsdir}/gnome-db.png
@@ -132,49 +136,53 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%post -n gnome-database-access-properties
+%post
+/sbin/ldconfig
%gconf_schema_install libgnomedb.schemas
-%scrollkeeper_update_post
-%preun -n gnome-database-access-properties
+%preun
%gconf_schema_uninstall libgnomedb.schemas
-%postun -n gnome-database-access-properties
-%scrollkeeper_update_postun
+%postun -p /sbin/ldconfig
+
+%post apidocs
+%scrollkeeper_update_post
+
+%postun apidocs
+%scrollkeeper_update_post
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libgnomedb-2.so.*.*.*
+# libglade2 module (include it here as lib requires libglade2 anyway)
+%attr(755,root,root) %{_libdir}/libglade/2.0/libgnomedb.so
+# for libgnomedb
+%{_datadir}/gnome-db
+%{_pixmapsdir}/libgnomedb
+%{_sysconfdir}/gconf/schemas/libgnomedb.schemas
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libgnomedb-2.so
+%{_libdir}/libgnomedb-2.la
%{_includedir}/libgnomedb-1.2
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/libgnomedb.pc
%files static
%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libgnomedb-2.a
%files apidocs
%defattr(644,root,root,755)
%{_gtkdocdir}/libgnomedb
+%{_omf_dest_dir}/%{name}
%files -n gnome-database-access-properties
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/libglade/2.0/*.so
-%{_datadir}/gnome-db
-%{_desktopdir}/*.desktop
-%{_pixmapsdir}/libgnomedb
+%attr(755,root,root) %{_bindir}/gnome-database-properties
+%{_desktopdir}/database-properties.desktop
%{_pixmapsdir}/gnome-db.png
-%{_omf_dest_dir}/%{name}
-%{_sysconfdir}/gconf/schemas/libgnomedb.schemas
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -182,6 +190,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.64 2007/06/02 15:49:30 qboosh
+- fixed packages split:
+ - library ui data, icons, schemas moved to main
+ - libglade2 module moved to main (useful for apps using libgnomedb,
+ not used by gnome-database-properties)
+ - scrollkeeper .omf file moved to -apidocs (references gtk-doc)
+
Revision 1.63 2007/06/02 10:53:06 qboosh
- URL
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/libgnomedb.spec?r1=1.63&r2=1.64&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
