Hello community,

here is the log from the commit of package seahorse-plugins for openSUSE:Factory
checked in at Mon May 23 12:49:44 CEST 2011.



--------
--- seahorse-plugins/seahorse-plugins.changes   2011-02-14 20:40:39.000000000 
+0100
+++ /mounts/work_src_done/STABLE/seahorse-plugins/seahorse-plugins.changes      
2011-05-02 17:09:05.000000000 +0200
@@ -1,0 +2,13 @@
+Mon May  2 14:34:52 UTC 2011 - fcro...@novell.com
+
+- Update to git snapshot (20110502) to get support for GTK3
+- Build with GTK+ 3.0.
+- add macros to disable easily gedit / applet / epiphany support
+  + gedit not yet ported to gtk3
+  + epiphane not yet portet to gtk3
+  + applet not yet ported to libpanelapplet-4.0
+- Drop seahorse-plugins-2.30.1-gpgisok.patch: fixed upstream
+- Add Obsoletes for gedit/applet/epiphany subpackages to ease
+  upgrade.
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  seahorse-plugins-2.30.1-gpgisok.patch
  seahorse-plugins-2.30.1.tar.bz2

New:
----
  seahorse-plugins-2.30.1.git.20110502.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ seahorse-plugins.spec ++++++
--- /var/tmp/diff_new_pack.JR1IO7/_old  2011-05-23 12:44:59.000000000 +0200
+++ /var/tmp/diff_new_pack.JR1IO7/_new  2011-05-23 12:44:59.000000000 +0200
@@ -17,39 +17,57 @@
 
 # norootforbuild
 
+%define build_gedit 0
+%define build_applet 0
+%define build_epiphany 0
 
 Name:           seahorse-plugins
-Version:        2.30.1
-Release:        10
+Version:        2.30.1.git.20110502
+Release:        1
+# FIXME: check if gedit/applet/epiphany can be enabled again (last checked 
with 2.30.1.git.20110502)
 License:        GFDLv1.1 ; GPLv2+
 Group:          Productivity/Security
 Summary:        Plugins for the seahorse cryptography interface
 Url:            http://www.gnome.org
 Source:         %{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM seahorse-plugins-2.30.1-gpgisok.patch bgo#607423 
mic...@sawicz.net -- fix signing / encrypting
-Patch0:         %{name}-2.30.1-gpgisok.patch
+%if %{build_epiphany}
 BuildRequires:  epiphany-devel
+%endif
 BuildRequires:  fdupes
+%if %{build_gedit}
 # For directory ownership:
 BuildRequires:  gedit
 BuildRequires:  gedit-devel
+%endif
 BuildRequires:  gnome-doc-utils-devel
+%if %{build_applet}
 BuildRequires:  gnome-panel-devel
+%endif
 BuildRequires:  gpg2
 BuildRequires:  gpgme-devel
 BuildRequires:  intltool
 BuildRequires:  libnotify-devel
 BuildRequires:  nautilus-devel
+BuildRequires:  pkgconfig(gnome-keyring-1)
 BuildRequires:  seahorse-devel
 BuildRequires:  shared-mime-info
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
-# Needed by the patch
+# Needed by git snapshot
 BuildRequires:  gnome-common
 Recommends:     %{name}-lang
 Supplements:    seahorse
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %gconf_schemas_prereq
+%if !%{build_applet}
+Obsoletes:      seahorse-plugins-applet <= 2.30.1
+%endif
+%if !%{build_epiphany}
+Obsoletes:      seahorse-plugins-epiphany <= 2.30.1
+%endif
+%if !%{build_gedit}
+Obsoletes:      seahorse-plugins-gedit <= 2.30.1
+%endif
 
 %description
 Seahorse is a graphical interface for managing and using encryption
@@ -59,6 +77,8 @@
 
 This package provides various plugins for seahorse.
 
+%if %{build_applet}
+
 %package applet
 License:        GFDLv1.1 ; GPLv2+
 Summary:        Plugins for the seahorse cryptography interface
@@ -72,6 +92,9 @@
 an easy to use interface for encryption operations.
 
 This package provides various plugins for seahorse.
+%endif
+
+%if %{build_epiphany}
 
 %package epiphany
 # When epiphany is updated, _epiphany_major_version will need to be too.
@@ -89,6 +112,9 @@
 an easy to use interface for encryption operations.
 
 This package provides various plugins for seahorse.
+%endif
+
+%if %{build_gedit}
 
 %package gedit
 License:        GFDLv1.1 ; GPLv2+
@@ -105,6 +131,7 @@
 an easy to use interface for encryption operations.
 
 This package provides various plugins for seahorse.
+%endif
 
 %package nautilus
 License:        GFDLv1.1 ; GPLv2+
@@ -125,10 +152,21 @@
 %prep
 %setup -q
 translation-update-upstream
-%patch0 -p1
 
 %build
+# needed because it is a git snapshot
+/usr/bin/gnome-autogen.sh
 %configure \
+%if !%{build_epiphany}
+    --disable-epiphany \
+%endif
+%if !%{build_applet}
+    --disable-applet \
+%endif
+%if !%{build_gedit}
+    --disable-gedit \
+%endif
+    --with-gtk=3.0 \
     --disable-static \
     --disable-update-mime-database \
     --disable-schemas-install \
@@ -137,6 +175,10 @@
 
 %install
 %makeinstall
+
+%if !%{build_applet}
+rm -f %{buildroot}%{_datadir}/icons/hicolor/*/apps/seahorse-applet.*
+%endif
 %if 0%{?suse_version} <= 1120
 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
 %endif
@@ -148,8 +190,10 @@
 %find_lang %{name} %{?no_lang_C}
 %def_gconf_schemas %{name}
 %add_gconf_schemas seahorse-plugins
+%if %{build_gedit}
 %def_gconf_schemas %{name}-gedit
 %add_gconf_schemas seahorse-gedit
+%endif
 %end_gconf_schemas
 %fdupes $RPM_BUILD_ROOT
 
@@ -167,17 +211,23 @@
 %desktop_database_postun
 %mime_database_postun
 
+%if %{build_applet}
+
 %post applet
 %icon_theme_cache_post
 
 %postun applet
 %icon_theme_cache_postun
+%endif
+
+%if %{build_gedit}
 
 %pre gedit -f %{name}-gedit.schemas_pre
 
 %posttrans gedit -f %{name}-gedit.schemas_posttrans
 
 %preun gedit -f %{name}-gedit.schemas_preun
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -200,6 +250,8 @@
 %{_mandir}/man1/*.1.gz
 %{_datadir}/mime/packages/*.xml
 
+%if %{build_applet}
+
 %files applet
 %defattr (-, root, root)
 %doc %{_datadir}/gnome/help/seahorse-applet
@@ -209,7 +261,9 @@
 %{_libdir}/bonobo/servers/*.server
 %{_libdir}/seahorse/seahorse-applet
 %{_datadir}/omf/seahorse-applet
-%if 0
+%endif
+
+%if %{build_epiphany}
 
 %files epiphany
 %defattr (-, root, root)
@@ -219,14 +273,17 @@
 %{_libdir}/epiphany/%_epiphany_major_version/extensions/seahorse.ephy-extension
 %endif
 
+%if %{build_gedit}
+
 %files gedit -f %{name}-gedit.schemas_list
 %defattr (-, root, root)
 %{_libdir}/gedit-2/plugins/*.so
 %{_libdir}/gedit-2/plugins/seahorse-pgp.gedit-plugin
+%endif
 
 %files nautilus
 %defattr (-, root, root)
-%{_libdir}/nautilus/extensions-2.0/*.so
+%{_libdir}/nautilus/extensions-3.0/*.so
 
 %files lang -f %{name}.lang
 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to