rpms/seahorse/devel seahorse.spec,1.43,1.44

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/seahorse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13688

Modified Files:
	seahorse.spec 
Log Message:
Fix spec



Index: seahorse.spec
===================================================================
RCS file: /cvs/extras/rpms/seahorse/devel/seahorse.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- seahorse.spec	23 Jul 2008 02:27:53 -0000	1.43
+++ seahorse.spec	23 Jul 2008 03:49:32 -0000	1.44
@@ -12,14 +12,12 @@
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  gedit-devel
 BuildRequires:  gettext
 BuildRequires:  gpgme-devel >= 1.0
 BuildRequires:  gnupg
 BuildRequires:  libgnome-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
-BuildRequires:  nautilus-devel
 BuildRequires:  libsoup-devel
 BuildRequires:  openldap-devel
 BuildRequires:  gnome-panel-devel
@@ -30,7 +28,6 @@
 BuildRequires:  gnome-keyring-devel
 BuildRequires:  avahi-devel
 BuildRequires:  avahi-glib-devel
-BuildRequires:  chrpath
 Requires(post): desktop-file-utils
 Requires(post): GConf2
 Requires(post): scrollkeeper
@@ -63,7 +60,7 @@
 
 
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-%find_lang seahorse
+%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
@@ -71,25 +68,6 @@
 rm -rf ${RPM_BUILD_ROOT}/usr/lib64/pkgconfig/cryptui-0.0.pc
 rm -f  ${RPM_BUILD_ROOT}%{_libdir}/libcryptui.so
 
-# Nuke rpath
-for f in %{_bindir}/seahorse{,-preferences,-tool,-daemon,-agent} \
-         %{_libdir}/seahorse/seahorse-{ssh-askpass,applet} \
-         %{_libdir}/gedit-2/plugins/libseahorse-pgp.so; do
-	 chrpath --delete $RPM_BUILD_ROOT${f}
-done
-
-rm -rf ${RPM_BUILD_ROOT}/var/scrollkeeper
-mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/applications
-desktop-file-install --vendor fedora --delete-original  \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
-  --add-category X-Fedora                               \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse-pgp-encrypted.desktop
-
-desktop-file-install --vendor fedora --delete-original  \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
-  --add-category X-Fedora                               \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/seahorse-pgp-signature.desktop
-
 desktop-file-install --vendor fedora --delete-original  \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
   --add-category GNOME                                  \
@@ -143,25 +121,13 @@
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*
 %{_datadir}/applications/*.desktop
-%dir %{_datadir}/gnome/help/%{name}
-%{_datadir}/gnome/help/%{name}/*
-%{_datadir}/gnome/help/%{name}-applet/*
-%{_datadir}/mime/packages/*
 %{_datadir}/icons/*
-%dir %{_datadir}/omf/%{name}
-%{_datadir}/omf/%{name}/*
-%dir %{_datadir}/omf/%{name}-applet
-%{_datadir}/omf/%{name}-applet/*
 %{_datadir}/pixmaps/*
 %{_mandir}/man1/*.gz
 %dir %{_libdir}/seahorse
 %{_libdir}/seahorse/*
-%{_datadir}/gnome-2.0/ui/GNOME_SeahorseApplet.xml
 %{_libdir}/libcryptui*
-%{_libdir}/gedit-2/plugins/*
-%{_libdir}/nautilus/extensions-2.0/libnautilus-seahorse.so
 %config(noreplace) %{_sysconfdir}/gconf/schemas/*
-%{_libdir}/bonobo/servers/GNOME_SeahorseApplet.server
 %{_datadir}/dbus-1/services/org.gnome.seahorse.service