SPECS: mergeant.spec - 0.67 - patches too old to review (context n...

[patrys]

Author: patrys                       Date: Fri Jan 18 02:09:28 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 0.67
- patches too old to review (context no longer relevant)

---- Files affected:
SPECS:
   mergeant.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/mergeant.spec
diff -u SPECS/mergeant.spec:1.13 SPECS/mergeant.spec:1.14
--- SPECS/mergeant.spec:1.13	Tue Feb 13 07:46:53 2007
+++ SPECS/mergeant.spec	Fri Jan 18 03:09:23 2008
@@ -2,15 +2,12 @@
 Summary:	Mergeant database admin tool
 Summary(pl.UTF-8):	Narzędzie do administrowania bazami danych
 Name:		mergeant
-Version:	0.52
-Release:	4
+Version:	0.67
+Release:	1
 License:	GPL
 Group:		Applications/Databases
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/mergeant/0.52/%{name}-%{version}.tar.bz2
-# Source0-md5:	e9f96b824e452e9b9406b4c11f005b95
-Patch0:		%{name}-locale-names.patch
-Patch1:		%{name}-pluginsdir.patch
-Patch2:		%{name}-libgda.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/mergeant/0.67/%{name}-%{version}.tar.bz2
+# Source0-md5:	c0cf45891f7704b11fb00281068b2f6f
 BuildRequires:	GConf2-devel >= 2.4.0
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
@@ -18,16 +15,20 @@
 BuildRequires:	gtk+2-devel >= 2:2.4.4
 BuildRequires:	gtk-doc
 BuildRequires:	intltool >= 0.11
-BuildRequires:	libgda-devel >= 1.2.1
+BuildRequires:	libgda3-devel >= 1.2.1
 BuildRequires:	libglade2 >= 2.0.1
-BuildRequires:	libgnomedb-devel >= 1.2.1
+BuildRequires:	libgnomedb3-devel >= 1.2.1
 BuildRequires:	libgnomeui-devel >= 2.4.0
 BuildRequires:	libgnomeprintui-devel >= 2.4.0
 BuildRequires:	libtool
 BuildRequires:	libxml2-devel
 BuildRequires:	pkgconfig
 BuildRequires:	scrollkeeper
-Requires:	%{name}-libs >= %{version}-%{release}
+Requires(post,postun):	desktop-file-utils
+Requires(post,postun):	hicolor-icon-theme
+Obsoletes:	mergeant-devel
+Obsoletes:	mergeant-libs
+Obsoletes:	mergeant-static
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -43,53 +44,8 @@
 a następnie wykonuje zapytania SQL zamiast użytkownika (który nie musi
 wpisywać ciągle tych samych poleceń SQL - choć jest to nadal możliwe).
 
-%package libs
-Summary:	Mergeant libraries
-Summary(pl.UTF-8):	Biblioteki Mergeanta
-Group:		X11/Libraries
-Requires:	gtk+2 >= 2:2.4.4
-
-%description libs
-Mergeant libraries.
-
-%description libs -l pl.UTF-8
-Biblioteki Mergeanta.
-
-%package devel
-Summary:	Libmergeant development files
-Summary(pl.UTF-8):	Pliki nagłówkowe libmergeant
-Group:		X11/Development/Libraries
-Requires:	%{name}-libs = %{version}-%{release}
-Requires:	gtk+2-devel >= 2:2.4.4
-Requires:	libgda-devel >= 1.2.1
-Requires:	libgnomedb-devel >= 1.2.1
-Requires:	libxml2-devel
-
-%description devel
-Libmergeant development files.
-
-%description devel -l pl.UTF-8
-Pliki nagłówkowe libmergeant.
-
-%package static
-Summary:	Static Mergeant libraries
-Summary(pl.UTF-8):	Biblioteki statyczne Mergeanta
-Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{version}-%{release}
-
-%description static
-Static Mergeant libraries.
-
-%description static -l pl.UTF-8
-Biblioteki statyczne Mergeanta.
-
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
-mv po/{no,nb}.po
 
 %build
 rm -f missing
@@ -99,6 +55,7 @@
 %{__autoconf}
 %{__automake}
 %configure \
+	--disable-update-mimedb \
 	--enable-gtk-doc \
 	--with-html-dir=%{_gtkdocdir}
 
@@ -121,45 +78,29 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-p /usr/bin/scrollkeeper-update
-%postun	-p /usr/bin/scrollkeeper-update
-
-%post	libs -p /sbin/ldconfig
-%postun	libs -p /sbin/ldconfig
+%post
+/usr/bin/scrollkeeper-update
+%update_mime_database
+%update_desktop_database_post
+%update_icon_cache hicolor
+
+%postun
+/usr/bin/scrollkeeper-update
+%update_desktop_database_postun
+%update_mime_database
+%update_icon_cache hicolor
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS
 %attr(755,root,root) %{_bindir}/mergeant
-%attr(755,root,root) %{_bindir}/mg-db-browser
-%attr(755,root,root) %{_bindir}/mg-verify-file
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/plugins
-%attr(755,root,root) %{_libdir}/%{name}/plugins/lib*.so*
 %{_libdir}/bonobo/servers/*.server
-%{_datadir}/application-registry/*
 %{_desktopdir}/*.desktop
-%{_datadir}/mergeant
-%{_datadir}/mime-info/*
 %{_omf_dest_dir}/%{name}
-%{_pixmapsdir}/document-icons/*
 %{_pixmapsdir}/mergeant
-
-%files libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
-
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
-%{_pkgconfigdir}/*.pc
-%{_includedir}/libmergeant
-%{_gtkdocdir}/libmergeant
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_pixmapsdir}/mergeant.png
+%{_iconsdir}/hicolor/48x48/mimetypes/*.png
+%{_datadir}/mime/packages/mergeant.xml
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -167,7 +108,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.13  2007-02-13 06:46:53  glen
+Revision 1.14  2008-01-18 02:09:23  patrys
+- 0.67
+- patches too old to review (context no longer relevant)
+
+Revision 1.13  2007/02/13 06:46:53  glen
 - tabs in preamble
 
 Revision 1.12  2007/02/12 00:49:07  baggins
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/mergeant.spec?r1=1.13&r2=1.14&f=u