diff --git a/.gitignore b/.gitignore index 1c8f613..56ac485 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ seahorse-2.30.0.tar.bz2 /seahorse-2.31.91.tar.bz2 /seahorse-2.91.0.tar.bz2 /seahorse-2.91.1.tar.bz2 +/seahorse-2.91.1.1.tar.bz2 +/seahorse-2.91.2-gitc548f3b.tar.gz diff --git a/seahorse.spec b/seahorse.spec index 321a114..197b60f 100644 --- a/seahorse.spec +++ b/seahorse.spec @@ -1,6 +1,8 @@ +%define alphatag gitc548f3b + Name: seahorse -Version: 2.91.1 -Release: 1%{?dist} +Version: 2.91.2 +Release: 0.1.%{alphatag}%{?dist} Summary: A GNOME application for managing encryption keys Group: User Interface/Desktops # seahorse is GPLv2+ @@ -8,7 +10,7 @@ Group: User Interface/Desktops License: GPLv2+ and LGPLv2+ URL: http://projects.gnome.org/seahorse/ #VCS: git:git://git.gnome.org/seahorse -Source: http://download.gnome.org/sources/seahorse/2.91/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/seahorse/2.91/%{name}-%{version}-%{alphatag}.tar.gz BuildRequires: glib2-devel BuildRequires: gtk3-devel @@ -46,13 +48,6 @@ Requires: pinentry-gui Obsoletes: gnome-keyring-manager -# https://bugzilla.gnome.org/show_bug.cgi?id=632436 -Patch0: seahorse-2.91.1-gtk3.patch - -# from upstream -Patch1: seahorse-2.91.1-new-gcr-patch.patch - - %description Seahorse is a graphical interface for managing and using encryption keys. It also integrates with nautilus, gedit and other places for encryption @@ -72,8 +67,6 @@ library that belongs to seahorse. %prep %setup -q -%patch0 -p1 -b .gtk3 -%patch1 -p1 -b .new-gcr %build @@ -110,16 +103,6 @@ rm -f ${RPM_BUILD_ROOT}/usr/share/icons/hicolor/icon-theme.cache find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';' find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';' -# save some space: only one screenshot is actually used, and it is -# identical in all languages -cd ${RPM_BUILD_ROOT}/usr/share/gnome/help/seahorse -for d in *; do - if [ -d $d -a "$d" != "C" ]; then - rm $d/figures/* - ln -s ../../C/figures/seahorse-window.png $d/figures/seahorse-window.png - fi -done - %post /sbin/ldconfig export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` @@ -171,6 +154,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : %{_datadir}/gir-1.0 %changelog +* Wed Nov 3 2010 Matthias Clasen 2.91.2-0.1.gitc548f3b +- git snapshot +- build against libnotify 0.7.0 + +* Tue Nov 2 2010 Matthias Clasen 2.91.1.1-1 +- Update to 2.91.1.1 + * Mon Oct 18 2010 Tomas Bzatek 2.91.1-1 - Update to 2.91.1 diff --git a/sources b/sources index d4a2bc6..0d56304 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8440260d1d9948aeb5a653c4d839e1c9 seahorse-2.91.1.tar.bz2 +9cd2602547ab442492e0461c269cc817 seahorse-2.91.2-gitc548f3b.tar.gz