rpms/awn-extras-applets/F-13 python_dir.patch, NONE, 1.1 awn-extras-applets.spec, 1.27, 1.28 sources, 1.6, 1.7
Leigh Scott
leigh123linux at fedoraproject.org
Sun Apr 25 16:09:16 UTC 2010
Author: leigh123linux
Update of /cvs/pkgs/rpms/awn-extras-applets/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31708
Modified Files:
awn-extras-applets.spec sources
Added Files:
python_dir.patch
Log Message:
* Sat Apr 24 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.4.0-2
- disable shave in configure
python_dir.patch:
Makefile.am | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- NEW FILE python_dir.patch ---
=== modified file 'shared/python/Makefile.am'
--- shared/python/Makefile.am 2010-01-02 20:40:44 +0000
+++ shared/python/Makefile.am 2010-04-13 15:07:03 +0000
@@ -1,7 +1,9 @@
NULL =
# awn python scripts
-pyawn_extrasdir = $(pythondir)/awn/extras
+# python doesn't like that awn is platform-specific, but awn.extras isn't
+#pyawn_extrasdir = $(pythondir)/awn/extras
+pyawn_extrasdir = $(pyexecdir)/awn/extras
pyawn_extras_PYTHON = \
__init__.py \
awnlib.py \
Index: awn-extras-applets.spec
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/F-13/awn-extras-applets.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- awn-extras-applets.spec 21 Jan 2010 22:10:00 -0000 1.27
+++ awn-extras-applets.spec 25 Apr 2010 16:09:16 -0000 1.28
@@ -1,24 +1,31 @@
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%endif
+
+
+
Name: awn-extras-applets
-Version: 0.3.2.2
-Release: 4%{?dist}
+Version: 0.4.0
+Release: 2%{?dist}
Summary: Extras applets for avant window navigator
Group: User Interface/Desktops
-License: GPLv2+
+License: GPLv2+ and LGPLv2+
URL: https://launchpad.net/awn-extras/
-Source0: https://edge.launchpad.net/awn-extras/0.3/%{version}/+download/%{name}-%{version}.tar.gz
-#patch modifies autotools files to make python bindings install to sitearch
-#requires autoreconf to take effect.
-#Patch0: %{name}-%{version}-python-platform.patch
-Patch0: %{name}-%{version}-fixdupentry.patch
+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
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: avant-window-navigator-devel >= 0.3.2
+BuildRequires: avant-window-navigator-devel >= 0.4.0
BuildRequires: libwnck-devel
BuildRequires: libXres-devel
BuildRequires: libglade2-devel
+BuildRequires: gnome-common
BuildRequires: gnome-menus-devel
BuildRequires: gnome-desktop-devel
BuildRequires: librsvg2-devel
@@ -38,11 +45,11 @@ BuildRequires: libtool
BuildRequires: intltool
BuildRequires: vala-devel
BuildRequires: WebKit-gtk-devel
-#BuildRequires: gettext
+BuildRequires: libdesktop-agnostic-bin
#required for autoreconf:
BuildRequires: autoconf, automake
-Requires: avant-window-navigator >= 0.3.2
+Requires: avant-window-navigator >= 0.4.0
Requires: gnome-python2-gnome
Requires: gnome-python2-gnomedesktop
Requires: gnome-python2-gnomevfs
@@ -52,6 +59,7 @@ Requires: gnome-python2-gtkmozembe
Requires: gstreamer-python
Requires: python-alsaaudio
Requires: python-feedparser
+Requires: python-xklavier
Requires: gnome-menus
Requires: acpi
Requires: dbus-python
@@ -67,27 +75,22 @@ Requires(preun): GConf2
%description
awn-extras-applets includes extras applets of Avant Window Navigator (Awn).
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
-
%prep
-%setup -q
-#%patch0 -p0
-%patch0 -p1 -b .fixdup
+%setup -q -n awn-extras-%{version}
+%patch0 -p0 -b .python_dir
+cp -p %{SOURCE1} applets/unmaintained/MiMenu/icons
+
%build
-#required for python-platform patch
libtoolize --force
autoreconf
-%configure --disable-static --disable-pymod-checks --with-webkit
+%configure --disable-static \
+ --disable-pymod-checks \
+ --with-webkit \
+ --disable-shave \
+ --with-gnu-ld
make %{?_smp_mflags}
@@ -110,26 +113,20 @@ stripscript()
for f in `find $RPM_BUILD_ROOT%{_datadir}/avant-window-navigator/applets/ -name *.py ! -executable`
do stripscript $f
done
-stripscript $RPM_BUILD_ROOT%{python_sitearch}/awn/extras/detach.py
+
+#remove test applets
+rm -rf $RPM_BUILD_ROOT%{_datadir}/avant-window-navigator/applets/python-test
+rm -rf $RPM_BUILD_ROOT%{_libdir}/awn/applets/vala-test
%pre
-SCHEMAS="arss awn-notification-daemon awnsystemmonitor awnterm cairo-clock DesktopManager digitalClock file-browser-launcher filebrowser places pynot-rgba pynot shinyswitcher to-do trash"
-if [ "$1" -gt 1 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- for name in ${SCHEMAS}; do
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/${name}.schemas >/dev/null || :
- done
-fi
+%gconf_schema_prepare awn-applet-awnterm awn-applet-bandwidth-monitor awn-applet-battery awn-applet-cairo-clock awn-applet-cairo-menu awn-applet-calendar awn-applet-comics awn-applet-cpufreq awn-applet-dialect awn-applet-digital-clock awn-applet-feeds awn-applet-file-browser-launcher awn-applet-garbage awn-applet-hardware-sensors awn-applet-mail awn-applet-media-control awn-applet-media-player awn-applet-mount awn-applet-notification-area awn-applet-notification-daemon awn-applet-pandora awn-applet-places awn-applet-quit awn-applet-shinyswitcher awn-applet-slickswitcher awn-applet-stacks awn-applet-sysmon awn-applet-to-do awn-applet-volume-control awn-applet-weather awn-applet-webapplet awnsystemmonitor
+
+%gconf_schema_obsolete DesktopManager arss awn-notification-daemon awnsystemmonitor awnterm cairo-clock digitalClock file-browser-launcher filebrowser places pynot-rgba pynot shinyswitcher to-do trash webapplet
+
%post
-SCHEMAS="arss awn-notification-daemon awnsystemmonitor awnterm cairo-clock DesktopManager digitalClock file-browser-launcher filebrowser places pynot-rgba pynot shinyswitcher to-do trash"
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-for name in ${SCHEMAS}; do
- gconftool-2 --makefile-install-rule \
- %{_sysconfdir}/gconf/schemas/${name}.schemas > /dev/null || :
-done
+%gconf_schema_upgrade awn-applet-awnterm awn-applet-bandwidth-monitor awn-applet-battery awn-applet-cairo-clock awn-applet-cairo-menu awn-applet-calendar awn-applet-comics awn-applet-cpufreq awn-applet-dialect awn-applet-digital-clock awn-applet-feeds awn-applet-file-browser-launcher awn-applet-garbage awn-applet-hardware-sensors awn-applet-mail awn-applet-media-control awn-applet-media-player awn-applet-mount awn-applet-notification-area awn-applet-notification-daemon awn-applet-pandora awn-applet-places awn-applet-quit awn-applet-shinyswitcher awn-applet-slickswitcher awn-applet-stacks awn-applet-sysmon awn-applet-to-do awn-applet-volume-control awn-applet-weather awn-applet-webapplet awnsystemmonitor
/sbin/ldconfig
@@ -137,14 +134,7 @@ touch --no-create %{_datadir}/icons/hico
%preun
-SCHEMAS="arss awn-notification-daemon awnsystemmonitor awnterm cairo-clock DesktopManager digitalClock file-browser-launcher filebrowser places pynot-rgba pynot shinyswitcher to-do trash"
-if [ "$1" -eq 0 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- for name in ${SCHEMAS}; do
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/${name}.schemas > /dev/null || :
- done
-fi
+%gconf_schema_remove awn-applet-awnterm awn-applet-bandwidth-monitor awn-applet-battery awn-applet-cairo-clock awn-applet-cairo-menu awn-applet-calendar awn-applet-comics awn-applet-cpufreq awn-applet-dialect awn-applet-digital-clock awn-applet-feeds awn-applet-file-browser-launcher awn-applet-garbage awn-applet-hardware-sensors awn-applet-mail awn-applet-media-control awn-applet-media-player awn-applet-mount awn-applet-notification-area awn-applet-notification-daemon awn-applet-pandora awn-applet-places awn-applet-quit awn-applet-shinyswitcher awn-applet-slickswitcher awn-applet-stacks awn-applet-sysmon awn-applet-to-do awn-applet-volume-control awn-applet-weather awn-applet-webapplet awnsystemmonitor
%postun
/sbin/ldconfig
@@ -161,26 +151,33 @@ gtk-update-icon-cache %{_datadir}/icons/
%clean
rm -rf $RPM_BUILD_ROOT
-%files
+%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING README
%config(noreplace) %{_sysconfdir}/gconf/schemas/*
-%{_libdir}/libawn-extras.so.*
%{_libdir}/awn
-%{python_sitearch}/awn/extras
+%dir %{python_sitearch}/awn/extras
+%{python_sitearch}/awn/extras/*
%{_datadir}/icons/hicolor/*/apps/*
%{_datadir}/avant-window-navigator/applets/*
-%{_datadir}/avant-window-navigator/defs/*
-
-%files devel
-%defattr(-,root,root,-)
-%doc COPYING
-%{_includedir}/*
-%{_libdir}/*.so
-%{_libdir}/pkgconfig/*
+%{_datadir}/avant-window-navigator/schemas/*
+%{_datadir}/locale/*/LC_MESSAGES/awn-extras.mo
%changelog
+* Sat Apr 24 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.4.0-2
+- disable shave in configure
+
+* Sat Apr 24 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.4.0-1
+- update to 0.4.0
+- remove devel package (it had no use)
+- add libdesktop-agnostic Br
+- replace the ubuntu icon in the MiMenu applet
+- add patch to fix python location
+- remove test applets
+- update scriptlets and python macros
+- update licence tag
+
* Fri Jan 22 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 0.3.2.2-4
- Rebuild for libgnome-desktop soname bump
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/awn-extras-applets/F-13/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources 10 Jun 2009 01:02:58 -0000 1.6
+++ sources 25 Apr 2010 16:09:16 -0000 1.7
@@ -1 +1,2 @@
-100699188f2157346cecd0dce0ddab03 awn-extras-applets-0.3.2.2.tar.gz
+b559d68cd6ad295c961c20fcc5d9f9c0 awn-extras-0.4.0.tar.gz
+e6419dc4f553697643fe0705effc68ce icon.svg
More information about the scm-commits
mailing list