[awn-extras-applets] new release 0.4.2-0.1.bzr1523

Tim Lauridsen timlau at fedoraproject.org
Tue May 31 05:24:06 UTC 2011


commit cbf15fc32e31b63d15c8019b5c1c40c4ee21d6ea
Author: Tim Lauridsen <timlau at fedoraproject.org>
Date:   Tue May 31 07:23:44 2011 +0200

    new release 0.4.2-0.1.bzr1523

 .gitignore                  |    1 +
 1285_1284.diff              |   13 -
 1286_1285.diff              |   19 --
 1302_1301.diff              |   18 --
 1303_1302.diff              |  691 -------------------------------------------
 1305_1304.diff              |   22 --
 1306_1305.diff              |   11 -
 1310_1309.diff              |   70 -----
 1311_1310.diff              |  209 -------------
 1312_1311.diff              |   14 -
 1318_1317.diff              |   16 -
 1331_1330.diff              |   21 --
 1388_1387.diff              |   22 --
 1389_1388.diff              |   11 -
 1390_1389.diff              |   13 -
 1391_1390.diff              |   22 --
 awn-extras-applets.spec     |   76 ++---
 fix-notification-area.patch |   14 +
 fix-yama.patch              |   14 +
 libnotify-070-fix.diff      |   15 -
 python_dir.patch            |   15 -
 sources                     |    3 +-
 22 files changed, 57 insertions(+), 1253 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 39c15c9..096c0cf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 awn-extras-0.4.0.tar.gz
 icon.svg
+/awn-extras-applets-0.4.2-bzr1523.tar.gz
diff --git a/awn-extras-applets.spec b/awn-extras-applets.spec
index 182fe10..7f650a4 100644
--- a/awn-extras-applets.spec
+++ b/awn-extras-applets.spec
@@ -3,42 +3,28 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif
 
-
+%global bzr bzr1523
 
 
 Name:           awn-extras-applets
-Version:        0.4.0
-Release:        27%{?dist}
+Version:        0.4.2
+Release:        0.1.%{bzr}%{?dist}
 Summary:        Extras applets for avant window navigator
 
 Group:          User Interface/Desktops
 License:        GPLv2+ and LGPLv2+
 URL:            https://launchpad.net/awn-extras/
-Source0:        https://edge.launchpad.net/awn-extras/0.4/%{version}/+download/awn-extras-%{version}.tar.gz
-Source1:        icon.svg
-#http://launchpadlibrarian.net/44044152/python_dir.patch
-Patch0:         python_dir.patch
-#http://bazaar.launchpad.net/~awn-extras/awn-extras/trunk/revision/1305
-Patch1:         1305_1304.diff
-Patch2:         1306_1305.diff
-Patch3:         1310_1309.diff
-Patch4:         1311_1310.diff
-Patch5:         1312_1311.diff
-Patch6:         1302_1301.diff
-Patch7:         1303_1302.diff
-Patch8:         1318_1317.diff
-Patch20:        1331_1330.diff
-Patch21:        1388_1387.diff
-Patch22:        1389_1388.diff
-Patch23:        1390_1389.diff
-Patch24:        1391_1390.diff
-Patch25:        1285_1284.diff
-Patch26:        1286_1285.diff
-Patch30:        libnotify-070-fix.diff
+# upstream snapshot: 
+# bzr branch lp:awn-extras
+# bzr export --root=awn-extras-applets-0.4.2-bzr1523 awn-extras-applets-0.4.2-bzr1523.tar.gz
+#
+Source0:        %{name}-%{version}-%{bzr}.tar.gz
+Patch0:         fix-notification-area.patch
+Patch1:         fix-yama.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  avant-window-navigator-devel >= 0.4.0
+BuildRequires:  avant-window-navigator-devel >= 0.4.1
 BuildRequires:  libwnck-devel
 BuildRequires:  libXres-devel
 BuildRequires:  libglade2-devel
@@ -68,7 +54,7 @@ BuildRequires:  autoconf, automake
 Obsoletes:      awn-extras-applets-devel < %{version}-%{release}
 Obsoletes:      %{name} < %{version}-%{release} 
 
-Requires:       avant-window-navigator >= 0.4.0
+Requires:       avant-window-navigator >= 0.4.1
 Requires:       gnome-python2-gnome
 Requires:       gnome-python2-gnomedesktop
 Requires:       gnome-python2-gnomevfs
@@ -76,6 +62,8 @@ Requires:       gnome-python2-libwnck
 Requires:       gnome-python2-rsvg
 Requires:       gnome-python2-gtkmozembed
 Requires:       gnome-python2-gconf
+Requires:       gnome-python2-libgtop2   
+Requires:       fortune-mod        
 Requires:       gstreamer-python
 Requires:       python-alsaaudio
 Requires:       python-feedparser
@@ -103,33 +91,15 @@ awn-extras-applets includes extras applets of Avant Window Navigator (Awn).
 
 
 %prep
-%setup -q -n awn-extras-%{version}
-%patch0 -p0 -b .python_dir
-%patch1 -p0 -b .1305_1304
-%patch2 -p0 -b .1306_1305
-%patch3 -p0 -b .1310_1309
-%patch4 -p0 -b .1311_1310
-%patch5 -p0 -b .1312_1311
-%patch6 -p0 -b .1302_1301
-%patch7 -p0 -b .1303_1302
-%patch8 -p0 -b .1318_1317
-%patch20 -p0 -b .1331_1330
-%patch21 -p0 -b .1388_1387
-%patch22 -p0 -b .1389_1388
-%patch23 -p0 -b .1390_1389
-%patch24 -p0 -b .1391_1390
-%patch25 -p0 -b .1285_1284
-%patch26 -p0 -b .1286_1285
-%patch30 -p1 -b .libnotify-070-fix
-
-
-cp -p %{SOURCE1} applets/unmaintained/MiMenu/icons
-
+%setup -q -n %{name}-%{version}-%{bzr}
+%patch0 -p0 -b .fix-notification-area
+%patch1 -p0 -b .fix-yama
 
 
 %build
 libtoolize --force
-autoreconf
+intltoolize -f
+autoreconf -v --install 
 %configure --disable-static \
            --disable-pymod-checks \
            --with-webkit \
@@ -231,6 +201,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue May 31 2011 Tim Lauridsen <timlau at fedoraproject.org> - 0.4.2-0.1.bzr1523
+- updated to upstream bzr snapshot 1523
+- remove old patches
+- added fix-notification-area.patch to fix compile issue in notification-area plugin
+- added fix-yama.patch to fix yama runtime issue when XDG_DATA_DIRS is not set.
+- Require/BuildReq newer version of avant-window-navigator ( 0.4.1 )
+- added gnome-python2-libgtop2, fortune-mod to Requires
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.4.0-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/fix-notification-area.patch b/fix-notification-area.patch
new file mode 100644
index 0000000..d3c7636
--- /dev/null
+++ b/fix-notification-area.patch
@@ -0,0 +1,14 @@
+=== modified file 'applets/maintained/notification-area/notification-area.vala'
+--- applets/maintained/notification-area/notification-area.vala	2010-08-21 19:11:43 +0000
++++ applets/maintained/notification-area/notification-area.vala	2011-05-29 08:56:24 +0000
+@@ -25,7 +25,8 @@
+ 
+ // our local "libraries"
+ using EggTray;
+-using NotificationAreaPrefs;
++// NotificationAreaPrefs is a class in na-prefs.vala, not a namespace
++//using NotificationAreaPrefs;
+ 
+ static bool gpm_workaround_done = false;
+ 
+
diff --git a/fix-yama.patch b/fix-yama.patch
new file mode 100644
index 0000000..d3c7636
--- /dev/null
+++ b/fix-yama.patch
@@ -0,0 +1,14 @@
+=== modified file 'applets/maintained/notification-area/notification-area.vala'
+--- applets/maintained/notification-area/notification-area.vala	2010-08-21 19:11:43 +0000
++++ applets/maintained/notification-area/notification-area.vala	2011-05-29 08:56:24 +0000
+@@ -25,7 +25,8 @@
+ 
+ // our local "libraries"
+ using EggTray;
+-using NotificationAreaPrefs;
++// NotificationAreaPrefs is a class in na-prefs.vala, not a namespace
++//using NotificationAreaPrefs;
+ 
+ static bool gpm_workaround_done = false;
+ 
+
diff --git a/sources b/sources
index 14043d4..e43dbba 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-b559d68cd6ad295c961c20fcc5d9f9c0  awn-extras-0.4.0.tar.gz
-e6419dc4f553697643fe0705effc68ce  icon.svg
+3a0dcd00ceab93eff3d653380b8aecf3  awn-extras-applets-0.4.2-bzr1523.tar.gz


More information about the scm-commits mailing list