packages: seahorse/seahorse.spec - 3.2.0 - merged from DEVEL

patrys patrys at pld-linux.org
Fri Sep 30 11:26:17 CEST 2011 

Author: patrys                       Date: Fri Sep 30 09:26:17 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 3.2.0
- merged from DEVEL

---- Files affected:
packages/seahorse:
   seahorse.spec (1.130 -> 1.131) 

---- Diffs:

================================================================
Index: packages/seahorse/seahorse.spec
diff -u packages/seahorse/seahorse.spec:1.130 packages/seahorse/seahorse.spec:1.131
--- packages/seahorse/seahorse.spec:1.130	Mon May 23 13:05:47 2011
+++ packages/seahorse/seahorse.spec	Fri Sep 30 11:26:12 2011
@@ -2,47 +2,41 @@
 Summary:	Seahorse - A GNOME front end for GnuPG
 Summary(pl.UTF-8):	Seahorse - frontend GNOME do GnuPG
 Name:		seahorse
-Version:	3.0.2
+Version:	3.2.0
 Release:	1
 License:	GPL v2
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/seahorse/3.0/%{name}-%{version}.tar.bz2
-# Source0-md5:	47feb342d2ce36727e1fde12b9e12dda
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/seahorse/3.2/%{name}-%{version}.tar.xz
+# Source0-md5:	bf8f07aaa492920355c7e5a30f3b29f2
 URL:		http://www.gnome.org/projects/seahorse/
-BuildRequires:	GConf2-devel >= 2.24.0
 BuildRequires:	atk-devel >= 1.32
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
+BuildRequires:	avahi-devel
 BuildRequires:	avahi-glib-devel >= 0.6
 BuildRequires:	dbus-glib-devel >= 0.71
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	gettext-devel
 BuildRequires:	gnome-doc-utils >= 0.14.0
-BuildRequires:	gnome-keyring-devel >= 3.0.0
+BuildRequires:	gnome-keyring-devel >= 3.2.0
 BuildRequires:	gnupg >= 1.4.5
-BuildRequires:	gobject-introspection-devel >= 0.6.4
 BuildRequires:	gpgme-devel >= 1:1.1.2
+BuildRequires:	glib2-devel
 BuildRequires:	gtk+3-devel >= 3.0.0
-BuildRequires:	gtk-doc >= 1.9
 BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libgnome-keyring-devel >= 2.26.0
-BuildRequires:	libnotify-devel >= 0.4.2
 BuildRequires:	libsoup-devel >= 2.4.0
 BuildRequires:	libtool
 BuildRequires:	openldap-devel >= 2.4.6
-BuildRequires:	pango-devel >= 1.28.2
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
-BuildRequires:	xorg-lib-libICE-devel
-BuildRequires:	xorg-lib-libSM-devel
+Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	gtk-update-icon-cache
 Requires(post,postun):	hicolor-icon-theme
-Requires(post,preun):	GConf2
 Requires:	gnupg >= 1.4.5
 Requires:	gnupg2
-Requires:	libcryptui = %{version}-%{release}
-Requires:	rarian
+Requires:	gnome-keyring >= 3.2.0
 # sr at Latn vs. sr at latin
 Conflicts:	glibc-misc < 6:2.7
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -62,52 +56,11 @@
 realizowane poprzez graficzny interfejs użytkownika, a zarządzanie
 kluczami jest prowadzone przez intuicyjny interfejs.
 
-%package -n libcryptui
-Summary:	libcryptui library
-Summary(pl.UTF-8):	Biblioteka libcryptui
-License:	LGPL v2
-Group:		X11/Libraries
-
-%description -n libcryptui
-libcryptui library.
-
-%description -n libcryptui -l pl.UTF-8
-Biblioteka libcryptui.
-
-%package -n libcryptui-devel
-Summary:	Header files for libcryptui library
-Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libcryptui
-License:	LGPL v2
-Group:		X11/Development/Libraries
-Requires:	GConf2-devel >= 2.24.0
-Requires:	gtk+3-devel >= 2.91.7
-Requires:	libcryptui = %{version}-%{release}
-
-%description -n libcryptui-devel
-This is the package containing the header files for libcryptui
-library.
-
-%description -n libcryptui-devel -l pl.UTF-8
-Ten pakiet zawiera pliki nagłówkowe biblioteki libcryptui.
-
-%package -n libcryptui-apidocs
-Summary:	libcryptui library API documentation
-Summary(pl.UTF-8):	Dokumentacja API biblioteki libcryptui
-Group:		Documentation
-Requires:	gtk-doc-common
-
-%description -n libcryptui-apidocs
-libcryptui library API documentation.
-
-%description -n libcryptui-apidocs -l pl.UTF-8
-Dokumentacja API biblioteki libcryptui.
-
 %prep
 %setup -q
 
 %build
 %{__glib_gettextize}
-%{__gtkdocize}
 %{__intltoolize}
 %{__libtoolize}
 %{__aclocal} -I m4
@@ -117,12 +70,9 @@
 %configure \
 	SSH_KEYGEN_PATH=%{_bindir}/ssh-keygen \
 	SSH_PATH=%{_bindir}/ssh \
-	--with-gtk=3.0 \
-	--enable-gtk-doc \
 	--enable-pgp \
-	--with-html-dir=%{_gtkdocdir} \
-	--disable-schemas-install \
-	--disable-scrollkeeper \
+	--disable-silent-rules \
+	--disable-schemas-compile \
 	--disable-static \
 	--disable-update-mime-database
 %{__make}
@@ -133,61 +83,36 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# remove internal API documentation
-%{__rm} -r $RPM_BUILD_ROOT%{_gtkdocdir}/libseahorse
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libcryptui.la
-
 %find_lang %{name} --with-gnome --with-omf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%gconf_schema_install seahorse.schemas
+%glib_compile_schemas
 %update_icon_cache hicolor
 
-%preun
-%gconf_schema_uninstall seahorse.schemas
-
 %postun
+%glib_compile_schemas
 %update_icon_cache hicolor
 
-%post	-n libcryptui -p /sbin/ldconfig
-%postun	-n libcryptui -p /sbin/ldconfig
-
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/seahorse
-%attr(755,root,root) %{_bindir}/seahorse-daemon
 %dir %{_libdir}/seahorse
 %attr(755,root,root) %{_libdir}/seahorse/seahorse-ssh-askpass
 %attr(755,root,root) %{_libdir}/seahorse/xloadimage
 %{_datadir}/%{name}
-%{_datadir}/dbus-1/services/org.gnome.seahorse.service
 %{_desktopdir}/seahorse.desktop
 %{_pixmapsdir}/*
 %{_iconsdir}/hicolor/*/*/*
-%{_sysconfdir}/gconf/schemas/seahorse.schemas
+%{_datadir}/GConf/gsettings/org.gnome.seahorse.convert
+%{_datadir}/GConf/gsettings/org.gnome.seahorse.manager.convert
+%{_datadir}/glib-2.0/schemas/org.gnome.seahorse.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.seahorse.manager.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.seahorse.window.gschema.xml
 %{_mandir}/man1/seahorse.1*
-%{_mandir}/man1/seahorse-daemon.1*
-
-%files -n libcryptui
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libcryptui.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libcryptui.so.0
-%{_libdir}/girepository-1.0/CryptUI-0.0.typelib
-
-%files -n libcryptui-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libcryptui.so
-%{_includedir}/libcryptui
-%{_pkgconfigdir}/cryptui-0.0.pc
-%{_datadir}/gir-1.0/CryptUI-0.0.gir
-
-%files -n libcryptui-apidocs
-%defattr(644,root,root,755)
-%{_gtkdocdir}/libcryptui
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -195,6 +120,19 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.131  2011/09/30 09:26:12  patrys
+- 3.2.0
+- merged from DEVEL
+
+Revision 1.130.2.3  2011/09/30 09:25:55  patrys
+- 3.2.0
+
+Revision 1.130.2.2  2011/09/18 13:27:46  wiget
+- up to 3.1.92
+
+Revision 1.130.2.1  2011/09/08 21:00:14  wiget
+- up to 3.1.91
+
 Revision 1.130  2011/05/23 11:05:47  megabajt
 - updated to 3.0.2
 
================================================================

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

More information about the pld-cvs-commit mailing list