From 66785b5916b9fb3dea01758bac5b940f7fc1dd26 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Wed, 6 Aug 2008 17:12:31 +0000
Subject: [PATCH] 2.23.6

---
 .cvsignore    |  2 +-
 seahorse.spec | 50 +++++++++++++++++++++++++++++++-------------------
 sources       |  2 +-
 3 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index d0685fa..4114373 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-seahorse-2.23.5.tar.bz2
+seahorse-2.23.6.tar.bz2
diff --git a/seahorse.spec b/seahorse.spec
index 97f27f6..a7aad8f 100644
--- a/seahorse.spec
+++ b/seahorse.spec
@@ -1,20 +1,19 @@
 Name: 		seahorse
-Version: 	2.23.5
+Version: 	2.23.6
 Release:        1%{?dist}
-Summary:	GNOME2 interface for gnupg
+Summary:	A GNOME application for managing encryption keys
 Group: 		User Interface/Desktops
 # seahorse is GPLv2+
 # libcryptui is LGPLv2+
 License:        GPLv2+ and LGPLv2+
-URL:            http://seahorse.sourceforge.net/
-Source:         http://ftp.gnome.org/pub/GNOME/sources/seahorse/2.23/%{name}-%{version}.tar.bz2
-Source1:	seahorse-agent.sh
+URL:            http://projects.gnome.org/seahorse/
+Source:         http://download.gnome.org/sources/seahorse/2.23/%{name}-%{version}.tar.bz2
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  gpgme-devel >= 1.0
-BuildRequires:  gnupg
+BuildRequires:  gnupg2
 BuildRequires:  libgnome-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
@@ -37,10 +36,21 @@ Requires(postun): scrollkeeper
 Requires(postun): shared-mime-info
 
 %description
-Seahorse is a gnome2 interface for gnupg.
-It uses gpgme as the backend.
+Seahorse is a graphical interface for managing and using encryption keys. 
+It also integrates with nautilus, gedit and other places for encryption 
+operations.
 
 
+%package devel
+Summary: Header files and libraries required to develop with seahorse
+Group: Development/Libraries
+Requires: pkgconfig >= 1:0.14
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+The seahorse-devel package contains the header files for the libcryptui
+library that belongs to seahorse.
+
 %prep
 %setup -q
 
@@ -55,18 +65,12 @@ rm -rf ${RPM_BUILD_ROOT}
 
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/
-install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/seahorse-agent.sh
+#mkdir -p $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/
+#install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/xinit/xinitrc.d/seahorse-agent.sh
 
 
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-%find_lang seahorse --with-gnome
-
-# get rid of the cryptui-devel stuff until we figure out whast do with it later
-rm -rf ${RPM_BUILD_ROOT}/usr/include/libcryptui
-rm -rf ${RPM_BUILD_ROOT}/usr/lib/pkgconfig/cryptui-0.0.pc
-rm -rf ${RPM_BUILD_ROOT}/usr/lib64/pkgconfig/cryptui-0.0.pc
-rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libcryptui.so
+%find_lang seahorse --with-gnome --all-name
 
 desktop-file-install --vendor fedora --delete-original  \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
@@ -117,7 +121,6 @@ fi
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README TODO
 %{_bindir}/*
-%{_sysconfdir}/X11/xinit/xinitrc.d/seahorse-agent.sh
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_datadir}/applications/*.desktop
@@ -126,12 +129,21 @@ fi
 %{_mandir}/man1/*.gz
 %dir %{_libdir}/seahorse
 %{_libdir}/seahorse/*
-%{_libdir}/libcryptui*
+%{_libdir}/libcryptui*.so.*
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*
 %{_datadir}/dbus-1/services/org.gnome.seahorse.service
 
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/libcryptui.so
+%{_includedir}/libcryptui
+%{_libdir}/pkgconfig/cryptui-0.0.pc
 
 %changelog
+* Tue Aug  5 2008 Matthias Clasen <mclasen@redhat.com> 2.23.6-1
+- Update to 2.23.6
+- Split off a -devel package
+
 * Tue Jul 22 2008 Matthias Clasen <mclasen@redhat.com> 2.23.5-1
 - Update to 2.23.5
 
diff --git a/sources b/sources
index d0c5ea9..ad3e70e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0ca5eeb803a87a01030bcb01364abead  seahorse-2.23.5.tar.bz2
+988bf4097304e5541dea1c44394ae243  seahorse-2.23.6.tar.bz2