packages: seahorse/seahorse.spec - up to 3.0.0, merge from DEVEL

[wiget]

Author: wiget                        Date: Thu Apr  7 10:28:13 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 3.0.0, merge from DEVEL

---- Files affected:
packages/seahorse:
   seahorse.spec (1.128 -> 1.129) 

---- Diffs:

================================================================
Index: packages/seahorse/seahorse.spec
diff -u packages/seahorse/seahorse.spec:1.128 packages/seahorse/seahorse.spec:1.129
--- packages/seahorse/seahorse.spec:1.128	Sat Mar 26 18:49:56 2011
+++ packages/seahorse/seahorse.spec	Thu Apr  7 12:28:08 2011
@@ -2,13 +2,12 @@
 Summary:	Seahorse - A GNOME front end for GnuPG
 Summary(pl.UTF-8):	Seahorse - frontend GNOME do GnuPG
 Name:		seahorse
-Version:	2.32.0
-Release:	2
+Version:	3.0.0
+Release:	1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.32/%{name}-%{version}.tar.bz2
-# Source0-md5:	bffb5ba78efb7eae760e05d8473ee7ad
-Patch0:		desktop.patch
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/seahorse/3.0/%{name}-%{version}.tar.bz2
+# Source0-md5:	068343c6e01a8fe07618d8f33d2d1345
 URL:		http://www.gnome.org/projects/seahorse/
 BuildRequires:	GConf2-devel >= 2.24.0
 BuildRequires:	atk-devel >= 1.32
@@ -19,11 +18,11 @@
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-devel
 BuildRequires:	gnome-doc-utils >= 0.14.0
-BuildRequires:	gnome-keyring-devel >= 2.30.0
+BuildRequires:	gnome-keyring-devel >= 3.0.0
 BuildRequires:	gnupg >= 1.4.5
 BuildRequires:	gobject-introspection-devel >= 0.6.4
 BuildRequires:	gpgme-devel >= 1:1.1.2
-BuildRequires:	gtk+2-devel >= 2:2.18.0
+BuildRequires:	gtk+3-devel >= 3.0.0
 BuildRequires:	gtk-doc >= 1.9
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libgnome-keyring-devel >= 2.26.0
@@ -81,7 +80,7 @@
 License:	LGPL v2
 Group:		X11/Development/Libraries
 Requires:	GConf2-devel >= 2.24.0
-Requires:	gtk+2-devel >= 2:2.18.0
+Requires:	gtk+3-devel >= 2.91.7
 Requires:	libcryptui = %{version}-%{release}
 
 %description -n libcryptui-devel
@@ -105,9 +104,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
-sed -i s#^en at shaw## po/LINGUAS
-rm po/en at shaw.po
 
 %build
 %{__glib_gettextize}
@@ -121,6 +117,7 @@
 %configure \
 	SSH_KEYGEN_PATH=%{_bindir}/ssh-keygen \
 	SSH_PATH=%{_bindir}/ssh \
+	--with-gtk=3.0 \
 	--enable-gtk-doc \
 	--enable-pgp \
 	--with-html-dir=%{_gtkdocdir} \
@@ -137,7 +134,8 @@
 	DESTDIR=$RPM_BUILD_ROOT
 
 # remove internal API documentation
-rm -rf $RPM_BUILD_ROOT%{_gtkdocdir}/libseahorse
+%{__rm} -r $RPM_BUILD_ROOT%{_gtkdocdir}/libseahorse
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libcryptui.la
 
 %find_lang %{name} --with-gnome --with-omf
 
@@ -183,7 +181,6 @@
 %files -n libcryptui-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcryptui.so
-%{_libdir}/libcryptui.la
 %{_includedir}/libcryptui
 %{_pkgconfigdir}/cryptui-0.0.pc
 %{_datadir}/gir-1.0/CryptUI-0.0.gir
@@ -198,11 +195,30 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.129  2011/04/07 10:28:08  wiget
+- up to 3.0.0, merge from DEVEL
+
 Revision 1.128  2011/03/26 17:49:56  glen
 - add seahorse to system settings, like gnome-keyring-manager is
 
 Revision 1.127  2011/02/04 18:24:03  wiget
 - Requires(post,postun): gtk-update-icon-cache
+
+Revision 1.126.2.5  2011/03/23 16:09:17  wiget
+- drop libtool file
+- use %{__rm} macro
+
+Revision 1.126.2.4  2011/03/23 10:04:18  wiget
+- up to 2.91.92
+
+Revision 1.126.2.3  2011/03/19 18:49:10  wiget
+- up to 2.91.91
+
+Revision 1.126.2.2  2010/12/28 23:53:20  wiget
+- 2.91.4
+
+Revision 1.126.2.1  2010/11/13 09:49:09  wiget
+- started update to 2.91.2
 
 Revision 1.126  2010/10/11 21:47:04  qwiat
 - updated to 2.32
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/seahorse/seahorse.spec?r1=1.128&r2=1.129&f=u