Author: havner                       Date: Tue Aug  8 21:24:59 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- 0.9.1, HEAD merge

---- Files affected:
SPECS:
   seahorse.spec (1.71 -> 1.71.2.1) 

---- Diffs:

================================================================
Index: SPECS/seahorse.spec
diff -u SPECS/seahorse.spec:1.71 SPECS/seahorse.spec:1.71.2.1
--- SPECS/seahorse.spec:1.71    Tue Jan 17 16:42:52 2006
+++ SPECS/seahorse.spec Tue Aug  8 23:24:53 2006
@@ -2,33 +2,36 @@
 Summary:       SeaHorse - A GNOME front end for GnuPG
 Summary(pl):   SeaHorse - frontend GNOME do GnuPG
 Name:          seahorse
-Version:       0.8
-Release:       2
+Version:       0.9.1
+Release:       1
 License:       GPL
 Group:         X11/Applications
-Source0:       
http://ftp.gnome.org/pub/gnome/sources/seahorse/0.8/%{name}-%{version}.tar.bz2
-# Source0-md5: b8c4878cdcbf57e9885583672934772c
+Source0:       
http://download.gnome.org/sources/seahorse/0.9/%{name}-%{version}.tar.gz
+# Source0-md5: 1752bd96de4530dfff92fe0aa4266029
 URL:           http://seahorse.sourceforge.net/
 Patch0:                %{name}-install.patch
 Patch1:                %{name}-desktop.patch
 Patch2:                %{name}-pl_po.patch
-BuildRequires: GConf2-devel
+BuildRequires: GConf2-devel >= 2.14.0
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: gedit2-devel >= 2.12.0
+BuildRequires: dbus-glib-devel >= 0.62
+BuildRequires: gedit2-devel >= 2.14.0
 BuildRequires: gettext-devel
+BuildRequires: gnome-doc-utils >= 0.6.0
+BuildRequires: gnome-panel-devel >= 2.14.0
 BuildRequires: gpgme-devel >= 1:1.0.0
 BuildRequires: intltool
-BuildRequires: libglade2-devel
-BuildRequires: libgnomeui-devel >= 2.12.0
-BuildRequires: libsoup-devel >= 2.2.6.1
+BuildRequires: libglade2-devel >= 1:2.6.0
+BuildRequires: libgnomeui-devel >= 2.14.0
+BuildRequires: libnotify-devel >= 0.4.0
+BuildRequires: libsoup-devel >= 2.2.93
 BuildRequires: libtool
-BuildRequires: nautilus-devel >= 2.12.0
+BuildRequires: nautilus-devel >= 2.14.0
 BuildRequires: openldap-devel >= 2.3.0
 BuildRequires: pkgconfig
-BuildRequires: rpmbuild(macros) >= 1.197
+BuildRequires: rpmbuild(macros) >= 1.311
 BuildRequires: scrollkeeper
-Requires(post,postun): /sbin/ldconfig
 Requires(post,preun):  GConf2
 Requires(post,postun): scrollkeeper
 Requires(post,postun): shared-mime-info
@@ -56,7 +59,7 @@
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
 Requires(post,preun):  GConf2
-Requires:      gedit2 >= 2.12.0
+Requires:      gedit2 >= 2.14.0
 
 %description -n gedit-plugin-seahorse
 This plugin performs encryption operations on text.
@@ -69,7 +72,7 @@
 Summary(pl):   Rozszerzenie Seahorse dla Nautilusa
 Group:         X11/Applications
 Requires:      %{name} = %{version}-%{release}
-Requires:      nautilus >= 2.12.0
+Requires:      nautilus >= 2.14.0
 
 %description -n nautilus-extension-seahorse
 Extension for signing and encrypting files.
@@ -77,6 +80,54 @@
 %description -n nautilus-extension-seahorse -l pl
 Rozszerzenie do podpisywania i szyfrowania plików.
 
+%package -n gnome-applet-seahorse
+Summary:       Seahorse applet
+Summary(pl):   Aplet Seahorse
+Group:         X11/Applications
+Requires:      %{name} = %{version}-%{release}
+Requires:      gnome-panel >= 2.14.0
+
+%description -n gnome-applet-seahorse
+Seahorse applet.
+
+%description -n gnome-applet-seahorse -l pl
+Aplet Seahorse.
+
+%package -n libcryptui
+Summary:       libcryptui library
+Summary(pl):   Biblioteka libcryptui
+Group:         Libraries
+
+%description -n libcryptui
+libcryptui library.
+
+%description -n libcryptui -l pl
+Biblioteka libcryptui.
+
+%package -n libcryptui-devel
+Summary:       Header files for libcryptui library
+Summary(pl):   Pliki nagłówkowe biblioteki libcryptui
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
+
+%description -n libcryptui-devel
+This is the package containing the header files for libcryptui library.
+
+%description -n libcryptui-devel -l pl
+Ten pakiet zawiera pliki nagłówkowe biblioteki libcryptui.
+
+%package -n libcryptui-static
+Summary:       Static libcryptui library
+Summary(pl):   Statyczna biblioteka libcryptui
+Group:         Development/Libraries
+Requires:       %{name}-devel = %{version}-%{release}
+
+%description -n libcryptui-static
+Static libcryptui library.
+
+%description -n libcryptui-static -l pl
+Statyczna biblioteka libcryptui.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -92,7 +143,8 @@
 %{__automake}
 %configure \
        --disable-schemas-install \
-       --disable-static
+       --disable-update-mime-database \
+       --disable-scrollkeeper
 %{__make}
 
 %install
@@ -104,9 +156,11 @@
 rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
 
 %find_lang %{name} --with-gnome
+%find_lang %{name}-applet --with-gnome
 
+rm -f $RPM_BUILD_ROOT%{_libdir}/{gedit-2/plugins,nautilus/extensions-1.0}/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/{gedit-2/plugins,nautilus/extensions-1.0}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/libseahorse-internal.{a,la}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -115,8 +169,7 @@
 /sbin/ldconfig
 %scrollkeeper_update_post
 %gconf_schema_install seahorse.schemas
-umask 022
-update-mime-database %{_datadir}/mime ||:
+%update_icon_cache hicolor
 
 %preun
 %gconf_schema_uninstall seahorse.schemas
@@ -124,10 +177,7 @@
 %postun
 /sbin/ldconfig
 %scrollkeeper_update_postun
-if [ $1 = 0 ]; then
-       umask 022
-       update-mime-database %{_datadir}/mime
-fi
+%update_icon_cache hicolor
 
 %post -n gedit-plugin-seahorse
 %gconf_schema_install seahorse-gedit.schemas
@@ -135,18 +185,40 @@
 %preun -n gedit-plugin-seahorse
 %gconf_schema_uninstall seahorse-gedit.schemas
 
+%post -n nautilus-extension-seahorse
+%update_mime_database
+
+%preun -n nautilus-extension-seahorse
+%update_mime_database
+
+%post -n gnome-applet-seahorse
+%scrollkeeper_update_post
+%update_icon_cache hicolor
+
+%postun -n gnome-applet-seahorse
+%scrollkeeper_update_postun
+%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-agent
-%attr(755,root,root) %{_bindir}/seahorse-pgp-preferences
+%attr(755,root,root) %{_bindir}/seahorse-daemon
+%attr(755,root,root) %{_bindir}/seahorse-preferences
 %attr(755,root,root) %{_libdir}/libseahorse-internal.so.*.*.*
-%{_datadir}/mime/packages/seahorse.xml
+%dir %{_libdir}/seahorse
+%attr(755,root,root) %{_libdir}/seahorse/*
 %{_datadir}/%{name}
+%{_datadir}/dbus-1/services/*
 %{_desktopdir}/*.desktop
 %{_omf_dest_dir}/%{name}
 %{_pixmapsdir}/*
+%exclude %{_pixmapsdir}/%{name}/*/%{name}-applet*
+%{_iconsdir}/hicolor/*/*/*
+%exclude %{_iconsdir}/hicolor/*/*/%{name}-applet*
 %{_sysconfdir}/gconf/schemas/seahorse.schemas
 
 %files -n gedit-plugin-seahorse
@@ -158,6 +230,30 @@
 %files -n nautilus-extension-seahorse
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/nautilus/extensions-1.0/*.so
+%{_datadir}/mime/packages/seahorse.xml
+
+%files -n gnome-applet-seahorse -f %{name}-applet.lang
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/seahorse-applet
+%{_libdir}/bonobo/servers/*
+%{_omf_dest_dir}/%{name}-applet
+%{_datadir}/gnome-2.0/ui/*
+%{_pixmapsdir}/%{name}/*/%{name}-applet*
+%{_iconsdir}/hicolor/*/*/%{name}-applet*
+
+%files -n libcryptui
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libcryptui.so.*.*.*
+
+%files -n libcryptui-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libcryptui.so
+%{_libdir}/libcryptui.la
+%{_includedir}/libcryptui
+
+%files -n libcryptui-static
+%defattr(644,root,root,755)
+%{_libdir}/libcryptui.a
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -165,6 +261,35 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.71.2.1  2006/08/08 21:24:53  havner
+- 0.9.1, HEAD merge
+
+Revision 1.79  2006/08/08 21:14:25  freetz
+- use HEAD deps / rpm macros
+
+Revision 1.78  2006/07/26 14:28:00  havner
+- BR gnome-panel-devel
+
+Revision 1.77  2006/07/25 20:05:07  qboosh
+- missing dir, dot
+
+Revision 1.76  2006/07/25 19:57:48  havner
+- argh, again
+
+Revision 1.75  2006/07/25 19:52:28  havner
+- formatting, typo in changelog
+
+Revision 1.74  2006/07/25 19:51:15  havner
+- mime file in nautilus subpackage
+
+Revision 1.73  2006/07/25 19:50:41  havner
+- 0.9.1
+- applet subpackage
+- libcrytpui library
+
+Revision 1.72  2006/03/06 12:38:45  freetz
+- 0.8.1
+
 Revision 1.71  2006/01/17 15:42:52  baggins
 - release 2
 - BR openldap 2.3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/seahorse.spec?r1=1.71&r2=1.71.2.1&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to