From fcfff0e645af6b86aaa178bdc5794cb6069b7aad Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Feb 03 2011 08:06:39 +0000 Subject: ditch the applet, fix build (gcc.patch), adjust deps, add dist tag --- diff --git a/revelation-0.4.11-gcc.patch b/revelation-0.4.11-gcc.patch new file mode 100644 index 0000000..b6f6688 --- /dev/null +++ b/revelation-0.4.11-gcc.patch @@ -0,0 +1,9 @@ +--- revelation-0.4.11/src/wrap/crack/Makefile.am 2006-06-11 11:17:22.000000000 -0700 ++++ revelation-0.4.11/src/wrap/crack/Makefile.am.new 2011-02-03 00:03:05.082097518 -0800 +@@ -19,5 +19,5 @@ + $(CC) -pthread -fno-strict-aliasing -fPIC -I${PYTHON_INCLUDE} -c crack.c -o crack.o + + crack.so: crack.o +- $(CC) -Wl --export-dynamic -pthread -shared crack.o -lcrack -o crack.so ++ $(CC) -Wl,--export-dynamic -pthread -shared crack.o -lcrack -o crack.so + diff --git a/revelation-0.4.11-no_applet.patch b/revelation-0.4.11-no_applet.patch new file mode 100644 index 0000000..8248c12 --- /dev/null +++ b/revelation-0.4.11-no_applet.patch @@ -0,0 +1,66 @@ +--- revelation-0.4.11/configure.ac 2007-01-16 02:39:13.000000000 -0800 ++++ revelation-0.4.11/configure.ac.new 2011-02-02 23:37:56.063141059 -0800 +@@ -22,11 +22,9 @@ + RVL_FDO_MIME() + + RVL_PYTHON_MODULE(Crypto, yes) +-RVL_PYTHON_MODULE(bonobo, yes) + RVL_PYTHON_MODULE(gconf, yes) + RVL_PYTHON_MODULE(gtk, yes) + RVL_PYTHON_MODULE(gnome, yes) +-RVL_PYTHON_MODULE(gnomeapplet, yes) + RVL_PYTHON_MODULE(gnomevfs, yes) + RVL_PYTHON_MODULE(gobject, yes) + RVL_PYTHON_MODULE(pango, yes) +@@ -36,7 +34,6 @@ + AC_OUTPUT([ + Makefile + data/Makefile +- data/bonobo/Makefile + data/cracklib/Makefile + data/gconf/Makefile + data/icons/Makefile +--- revelation-0.4.11/src/Makefile.am 2006-12-03 03:13:47.000000000 -0800 ++++ revelation-0.4.11/src/Makefile.am.new 2011-02-02 23:35:02.224225940 -0800 +@@ -7,9 +7,8 @@ + + SUBDIRS = bundle lib wrap + bin_SCRIPTS = revelation +-libexec_SCRIPTS = revelation-applet +-EXTRA_DIST = revelation.in revelation-applet.in +-CLEANFILES = revelation revelation-applet ++EXTRA_DIST = revelation.in ++CLEANFILES = revelation + + + revelation: revelation.in +@@ -17,9 +16,3 @@ + -e "s|\@pyexecdir\@|$(pyexecdir)|" \ + revelation.in > revelation + +-revelation-applet: revelation-applet.in +- sed \ +- -e "s|\@pyexecdir\@|$(pyexecdir)|" \ +- -e "s|\@bindir\@|$(bindir)|" \ +- revelation-applet.in > revelation-applet +- +--- revelation-0.4.11/data/Makefile.am 2011-02-02 23:37:06.346020749 -0800 ++++ revelation-0.4.11/data/Makefile.am.new 2011-02-02 23:37:14.471203808 -0800 +@@ -5,5 +5,5 @@ + # $Id: Makefile.am 377 2005-07-26 19:42:31Z erikg $ + # + +-SUBDIRS = bonobo cracklib gconf icons mime ui ++SUBDIRS = cracklib gconf icons mime ui + +--- revelation-0.4.11/data/gconf/Makefile.am 2006-06-12 12:05:11.000000000 -0700 ++++ revelation-0.4.11/data/gconf/Makefile.am.new 2011-02-02 23:35:58.219486379 -0800 +@@ -6,7 +6,7 @@ + # + + schemadir = @GCONF_SCHEMA_FILE_DIR@ +-dist_schema_DATA = revelation.schemas revelation-applet.schemas ++dist_schema_DATA = revelation.schemas + + + install-data-hook: diff --git a/revelation.spec b/revelation.spec index 9450f78..f319962 100644 --- a/revelation.spec +++ b/revelation.spec @@ -4,18 +4,19 @@ Summary: Password manager for GNOME 2 Name: revelation Version: 0.4.11 -Release: 11 +Release: 12%{?dist} License: GPLv2+ Group: Applications/Productivity Source0: ftp://oss.codepoet.no/revelation/revelation-0.4.11.tar.bz2 -Patch0: revelation_ui.patch +Patch0: revelation_ui.patch +Patch1: revelation-0.4.11-no_applet.patch +Patch2: revelation-0.4.11-gcc.patch URL: http://oss.codepoet.no/revelation/ Requires: python-crypto >= 2.0 Requires: pygtk2 >= 2.4 Requires: gnome-python2-gconf >= 2.0 Requires: gnome-python2-gnomevfs >= 2.6 Requires: gnome-python2-applet -Requires: gnome-python2-bonobo Requires: cracklib-dicts BuildRequires: python >= 2.2 BuildRequires: python-devel >= 2.3 @@ -23,7 +24,6 @@ BuildRequires: pygtk2-devel >= 2.4 BuildRequires: gnome-python2-devel >= 2.5 BuildRequires: gnome-python2-gconf >= 2.0 BuildRequires: libgnomeui-devel >= 2.8 -BuildRequires: gnome-python2-bonobo BuildRequires: gnome-keyring-devel >= 0.4.0 BuildRequires: desktop-file-utils BuildRequires: python-crypto >= 2.0 @@ -31,8 +31,9 @@ BuildRequires: cracklib-devel BuildRequires: cracklib-dicts BuildRequires: gettext BuildRequires: perl(XML::Parser) -BuildRequires: gnome-python2-applet gnome-python2-gnome +BuildRequires: gnome-python2-gnome BuildRequires: gnome-panel-devel gnome-python2-extras gnome-python2-desktop +BuildRequires: intltool BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot-%(%{__id_u} -n) Requires(post): GConf2 shared-mime-info desktop-file-utils Requires(preun): GConf2 @@ -45,8 +46,11 @@ a tree structure, and stores them as AES-encrypted XML files. %prep %setup -q %patch0 -p0 +%patch1 -p1 -b .noapplet +%patch2 -p1 -b .gcc %build +autoreconf -i %configure --disable-desktop-update --disable-mime-update --with-cracklib-dict=/usr/share/cracklib/pw_dict make %{?_smp_mflags} CC="%{__cc} $RPM_OPT_FLAGS" @@ -104,10 +108,14 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &> /dev/null || : %{_datadir}/icons/hicolor/*/apps/%{name}*.png %{python_sitearch}/revelation/ %{_datadir}/mime/packages/* -%{_libdir}/bonobo/servers/GNOME_RevelationApplet.server -%{_libexecdir}/revelation-applet %changelog +* Wed Feb 02 2011 Adam Williamson - 0.4.11-12 +- ditch the applet, we're not supporting them any more in GNOME 3 +- drop some now useless deps, add a BR on intltool +- gcc.patch: fix incorrect use of --export-dynamic parameter +- add the dist tag to the EVR + * Thu Jul 22 2010 David Malcolm - 0.4.11-11 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild