SPECS: libgnomedb.spec - merged from gda-1_2 branch, use HEAD deps...

freetz freetz at pld-linux.org
Fri Aug 11 20:50:21 CEST 2006 

Author: freetz                       Date: Fri Aug 11 18:50:20 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from gda-1_2 branch, use HEAD deps, apidocs subpkg, changelog cut

---- Files affected:
SPECS:
   libgnomedb.spec (1.56 -> 1.57) 

---- Diffs:

================================================================
Index: SPECS/libgnomedb.spec
diff -u SPECS/libgnomedb.spec:1.56 SPECS/libgnomedb.spec:1.57
--- SPECS/libgnomedb.spec:1.56	Sun Aug  6 19:41:25 2006
+++ SPECS/libgnomedb.spec	Fri Aug 11 20:50:15 2006
@@ -1,35 +1,33 @@
 # $Revision$, $Date$
 Summary:	GNOME-DB widget library
-Summary(pl):	Biblioteka widgetu GNOME-DB
+Summary(pl):	Biblioteka widgetów GNOME-DB
 Name:		libgnomedb
-Version:	1.9.100
-Release:	7
+Version:	1.2.2
+Release:	3
+Epoch:		1
 License:	LGPL v2+
 Group:		Applications/Databases
-Source0:	http://ftp.gnome.org/pub/gnome/sources/libgnomedb/1.9/%{name}-%{version}.tar.bz2
-# Source0-md5:	a98ac52f084b1b0abad6b2c53ec034cc
+Source0:	http://ftp.gnome.org/pub/gnome/sources/libgnomedb/1.2/%{name}-%{version}.tar.bz2
+# Source0-md5:	cf8b1eb3aa3e7b18f46bc9bc9335dca7
 Patch0:		%{name}-desktop.patch
-Patch1:		%{name}-gnome.patch
-BuildRequires:	GConf2-devel >= 2.14.0
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake >= 1:1.8
+BuildRequires:	GConf2-devel
 BuildRequires:	gettext-devel
 BuildRequires:	gnome-common >= 2.12.0
-BuildRequires:	gtk+2-devel >= 2:2.10.0
-BuildRequires:	gtk-doc >= 1.6
-BuildRequires:	gtksourceview-devel >= 1.6.1
+BuildRequires:	gtk+2-devel >= 2:2.10.1
+BuildRequires:	gtk-doc >= 1.7
+BuildRequires:	gtksourceview-devel >= 1.7.2
 BuildRequires:	intltool
-BuildRequires:	libgda-devel >= 1.9.100
+BuildRequires:	libgda-devel >= 1:1.2.3
 BuildRequires:	libglade2-devel >= 1:2.6.0
-BuildRequires:	libgnomeui-devel >= 2.15.2
+BuildRequires:	libgnomeui-devel >= 2.15.91
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		filterout_ld	(-Wl,)?--as-needed
-
 %description
 libgnomedb is a library that eases the task of writing GNOME database
 programs.
@@ -41,10 +39,10 @@
 Summary:	GNOME-DB widget library development
 Summary(pl):	Dla programistów widgetu GNOME-DB
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	gtksourceview-devel >= 1.6.1
-Requires:	libgda-devel >= 1.9.100
-Requires:	libgnomeui-devel >= 2.15.2
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	gtksourceview-devel >= 1.7.2
+Requires:	libgda-devel >= 1:1.2.3
+Requires:	libgnomeui-devel >= 2.15.91
 
 %description devel
 libgnomedb is a library that eases the task of writing GNOME database
@@ -58,7 +56,7 @@
 Summary:	GNU Data Access static libraries
 Summary(pl):	Statyczne biblioteki GNU Data Access
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
+Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
 
 %description static
 GNOME-DB widget static libraries.
@@ -66,14 +64,25 @@
 %description static -l pl
 Statyczne biblioteki widgetu GNOME-DB.
 
+%package apidocs
+Summary:	libgnomedb API documentation
+Summary(pl):	Dokumentacja API libgnomedb
+Group:		Documentation
+Requires:	gtk-doc-common
+
+%description apidocs
+libgnomedb API documentation.
+
+%description apidocs -l pl
+Dokumentacja API libgnomedb.
+
 %package -n gnome-database-access-properties
 Summary:	Database access properties
 Summary(pl):	Właściwości dostępu do baz danych
 Group:		X11/Applications
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires(post,preun):	GConf2 >= 2.14.0
 Requires(post,postun):	scrollkeeper
-Requires:	gtk+2 >= 2:2.10.0
 
 %description -n gnome-database-access-properties
 Allows to configure database access properties in GNOME.
@@ -84,7 +93,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__intltoolize}
@@ -117,7 +125,6 @@
 
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 rm -rf $RPM_BUILD_ROOT%{_datadir}/mime-info
-rm -f $RPM_BUILD_ROOT%{_libdir}/libgnomedb/plugins/*.{a,la}
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -141,32 +148,32 @@
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS
 %attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-%dir %{_libdir}/libgnomedb
-%dir %{_libdir}/libgnomedb/plugins
-%attr(755,root,root)%{_libdir}/libgnomedb/plugins/lib*.so*
+
+%files -n gnome-database-access-properties
+%defattr(644,root,root,755)
+%{_sysconfdir}/gconf/schemas/libgnomedb.schemas
+%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_libdir}/libglade/2.0/*.so
+%{_datadir}/gnome-db
+%{_desktopdir}/*
+%{_pixmapsdir}/libgnomedb
+%{_pixmapsdir}/gnome-db.png
+%{_omf_dest_dir}/%{name}
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
-%{_includedir}/libgnomedb-1.9
+%{_includedir}/libgnomedb-1.2
 %{_pkgconfigdir}/*.pc
-%{_gtkdocdir}/libgnomedb
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/lib*.a
 
-%files -n gnome-database-access-properties
+%files apidocs
 %defattr(644,root,root,755)
-%{_sysconfdir}/gconf/schemas/*
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/libglade/2.0/*.so
-%{_desktopdir}/*
-%{_datadir}/libgnomedb
-%{_omf_dest_dir}/%{name}
-%{_pixmapsdir}/libgnomedb
-%{_pixmapsdir}/gnome-db.png
+%{_gtkdocdir}/libgnomedb
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -174,38 +181,6 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.56  2006/08/06 17:41:25  wolf
-- w/o --as-needed
-
-Revision 1.55  2006/07/14 20:47:49  freetz
-- rel.6, updated deps (no --as-needed support - breaks build)
-
-Revision 1.54  2006/06/11 16:47:34  freetz
-- corrected changelog
-
-Revision 1.53  2006/06/11 16:37:42  freetz
-- rel.5, GNOME 2.15.x deps
-
-Revision 1.52  2006/03/23 19:45:07  freetz
-- rel.4
-
-Revision 1.51  2005/10/25 21:30:09  freetz
-- rel.3 for rebuild
-
-Revision 1.50  2005/10/24 21:22:58  arekm
-- rel 2; install missing.h file
-
-Revision 1.49  2005/10/19 19:40:04  freetz
-- merged from DEVEL
-
-Revision 1.48.2.4  2005/10/19 19:38:50  freetz
-- 1.9.100
-
-Revision 1.48.2.3  2005/08/30 08:31:29  aflinta
-- fixed devel requirements
-
-Revision 1.48.2.2  2005/08/16 12:02:20  freetz
-- 1.3.91, separated control center applet
+Revision 1.57  2006/08/11 18:50:15  freetz
+- merged from gda-1_2 branch, use HEAD deps, apidocs subpkg, changelog cut
 
-Revision 1.48.2.1  2005/07/11 15:49:35  freetz
-- 1.3.3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/libgnomedb.spec?r1=1.56&r2=1.57&f=u

More information about the pld-cvs-commit mailing list