rpms/avant-window-navigator/F-11 688_687.diff, NONE, 1.1 dso.patch, NONE, 1.1 firefox_desktopfile_fix.patch, NONE, 1.1 avant-window-navigator.spec, 1.31, 1.32 sources, 1.7, 1.8

Mon Apr 26 13:34:14 UTC 2010

Author: leigh123linux

Update of /cvs/pkgs/rpms/avant-window-navigator/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18187

Modified Files:
	avant-window-navigator.spec sources 
Added Files:
	688_687.diff dso.patch firefox_desktopfile_fix.patch 
Log Message:
* Sat Apr 24 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.4.0-1
- update to 0.4.0
- update scriptlets
- drop Br gnome-vfs2-devel gnome-common
- add Br libgtop2-devel
- add the libdesktop-agnostic Br and Requires
- add Requires pkgconfig to devel
- add requires bzr
- fix firefox desktop file location
- add patch to fix unitialized pointer
- add patch to fix DSO linking


688_687.diff:
 awn-applet-simple.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE 688_687.diff ---
--- libawn/awn-applet-simple.c	2010-01-10 14:43:43 +0000
+++ libawn/awn-applet-simple.c	2010-04-11 21:08:28 +0000
@@ -393,16 +393,16 @@
                                  GStrv            states,
                                  GStrv            icon_names)
 {
-  gchar *applet_name;
+  gchar *applet_name=NULL;
   
   g_return_if_fail (AWN_IS_APPLET_SIMPLE (applet));
-  g_return_if_fail (applet_name);
   g_return_if_fail (states);
   g_return_if_fail (icon_names);
 
   g_object_get (applet,
                 "canonical-name",&applet_name,
                 NULL);  
+  g_return_if_fail (applet_name);
   applet->priv->last_set_icon = ICON_THEMED_MANY;
   awn_themed_icon_set_size (AWN_THEMED_ICON (applet->priv->icon),
                             awn_applet_get_size (AWN_APPLET (applet)));


dso.patch:
 configure         |    2 +-
 tests/Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE dso.patch ---
--- avant-window-navigator-0.4.0.orig/configure	2010-04-11 15:29:20.000000000 +0100
+++ avant-window-navigator-0.4.0/configure	2010-04-12 17:24:42.000000000 +0100
@@ -13993,7 +13993,7 @@ fi
 
 
 LIBRARY_MODULES="glib-2.0 >= $MIN_GLIB_VERSION gthread-2.0 gobject-2.0 desktop-agnostic >= $MIN_LDA_VERSION gtk+-2.0 >= $MIN_GTK_VERSION gdk-2.0 >= $MIN_GTK_VERSION dbus-glib-1"
-DOCK_MODULES="x11 xproto xcomposite xrender xext"
+DOCK_MODULES="x11 xproto xcomposite xrender xext desktop-agnostic gtk+-2.0 dbus-glib-1"
 TASKMANAGER_MODULES="libwnck-1.0 >= $MIN_WNCK_VERSION x11 libgtop-2.0 xext"
 
 
--- avant-window-navigator-0.4.0.orig/tests/Makefile.in	2010-04-11 15:29:23.000000000 +0100
+++ avant-window-navigator-0.4.0/tests/Makefile.in	2010-04-12 21:24:56.000000000 +0100
@@ -179,7 +179,7 @@ LD = @LD@
 LDA_BINDIR = @LDA_BINDIR@
 LDA_DEFSDIR = @LDA_DEFSDIR@
 LDA_VAPIDIR = @LDA_VAPIDIR@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = @LDFLAGS@ -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lgdk_pixbuf-2.0 -lcairo -lgobject-2.0
 LIBAPPLETDIR = @LIBAPPLETDIR@
 LIBDIR = @LIBDIR@
 LIBOBJS = @LIBOBJS@

firefox_desktopfile_fix.patch:
 awn-applet-taskmanager.schema-ini.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE firefox_desktopfile_fix.patch ---
--- avant-window-navigator-0.4.0.orig/applets/taskmanager/awn-applet-taskmanager.schema-ini.in	2010-04-11 14:46:56.000000000 +0100
+++ avant-window-navigator-0.4.0/applets/taskmanager/awn-applet-taskmanager.schema-ini.in	2010-04-15 23:09:14.000000000 +0100
@@ -75,7 +75,7 @@ _description=How to generate the list of
 
 [DEFAULT/launcher_paths]
 type = list-string
-default = /usr/share/applications/firefox.desktop;
+default = /usr/share/applications/mozilla-firefox.desktop;
 _description=a list of paths to .desktop files from which the taskmanager should create it's launchers
 
 [DEFAULT/match_strength]


Index: avant-window-navigator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avant-window-navigator/F-11/avant-window-navigator.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- avant-window-navigator.spec	9 Feb 2010 18:26:03 -0000	1.31
+++ avant-window-navigator.spec	26 Apr 2010 13:34:13 -0000	1.32
@@ -1,8 +1,11 @@
+%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:           avant-window-navigator
-Version:        0.3.2.1
-Release:        2%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 
 Provides: avant-window-navigator-python = %{version}-%{release}
 Obsoletes: avant-window-navigator-python < 0.2.6-3
@@ -13,22 +16,27 @@ Group:          User Interface/Desktops
 #libawn is LGPLv2+, rest is GPLv2+
 License:        GPLv2+ and LGPLv2+
 URL:            https://launchpad.net/awn
-Source0:        https://launchpad.net/awn/0.2/%{version}/+download/%{name}-%{version}.tar.gz
-
+Source0:        https://launchpad.net/awn/0.4/%{version}/+download/%{name}-%{version}.tar.gz
+Patch0:         dso.patch
+Patch1:         firefox_desktopfile_fix.patch
+Patch2:         688_687.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-
 BuildRequires:  libwnck-devel dbus-glib-devel
-BuildRequires:  gnome-common pygtk2-devel GConf2-devel startup-notification-devel
-BuildRequires:  gnome-desktop-devel libgnome-devel gnome-vfs2-devel gnome-python2
-BuildRequires:  libXdamage-devel libXcomposite-devel libXres-devel 
+BuildRequires:  pygtk2-devel GConf2-devel startup-notification-devel
+BuildRequires:  gnome-desktop-devel libgnome-devel gnome-python2
+BuildRequires:  libXdamage-devel libXcomposite-devel libXres-devel
+BuildRequires:  libdesktop-agnostic-devel python-desktop-agnostic
+BuildRequires:  libdesktop-agnostic-bin
 BuildRequires:  gettext, intltool
 BuildRequires:  desktop-file-utils
-BuildRequires:  pyxdg
+BuildRequires:  pyxdg libgtop2-devel
 BuildRequires:  vala
 
-Requires:       gnome-python2-gconf, gnome-python2-gnomedesktop, pyxdg
+Requires:       gnome-python2-gconf, gnome-python2-gnomedesktop, pyxdg, bzr
+Requires:       libdesktop-agnostic-bin
+Requires:       python-desktop-agnostic
 Requires(pre):  GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -41,21 +49,23 @@ the screen (in all its composited-goodne
 Summary:    Fully customisable dock-like window navigator for GNOME
 Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
+Requires:   pkgconfig
 
 %description devel
 This package includes all header files and library of AWN for development.
 
 %prep
 %setup -q
-
-#fix permissions
-chmod 0644 $RPM_BUILD_DIR/%{name}-%{version}/src/xutils.h
-chmod 0644 $RPM_BUILD_DIR/%{name}-%{version}/src/xutils.c
-chmod 0644 $RPM_BUILD_DIR/%{name}-%{version}/src/inlinepixbufs.h
+%patch0 -p1 -b .dso
+%patch1 -p1 -b .firefox_desktopfile_fix
+%patch2 -p0 -b .688_687
 
 
 %build
-%configure --disable-static --disable-schemas-install
+%configure --disable-static \
+           --with-gnu-ld \
+           --with-vala \
+           --disable-shave
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
@@ -63,10 +73,15 @@ make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_  _INSTALL=1
+export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm
 
+#remove shebangs
+sed -i -e '/^#!\//, 1d' $RPM_BUILD_ROOT%{_datadir}/avant-window-navigator/awn-settings/awnSettings.py
+sed -i -e '/^#!\//, 1d' $RPM_BUILD_ROOT%{_datadir}/avant-window-navigator/awn-settings/awnSettingsHelper.py
+
+
 %find_lang %{name}
 
 desktop-file-install --delete-original  \
@@ -77,63 +92,37 @@ desktop-file-install --delete-original  
 desktop-file-install --delete-original  \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
         --remove-category Application \
-        $RPM_BUILD_ROOT%{_datadir}/applications/awn-manager.desktop
+        $RPM_BUILD_ROOT%{_datadir}/applications/awn-settings.desktop
 
 
 %pre
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/awn.schemas >/dev/null || :
-fi
+%gconf_schema_prepare avant-window-navigator awn-applet-taskmanager
+%gconf_schema_obsolete awn awn-applets-shared
 
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/awn-applets-shared.schemas >/dev/null || :
-fi
 
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/awn.schemas > /dev/null || :
-
-
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/awn-applets-shared.schemas > /dev/null || :
-
+%gconf_schema_upgrade avant-window-navigator awn-applet-taskmanager
 
 /sbin/ldconfig
 
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %preun
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/awn.schemas > /dev/null || :
-fi
-
+%gconf_schema_remove avant-window-navigator awn-applet-taskmanager
 
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/awn-applets-shared.schemas > /dev/null || :
-fi
 
 %postun
 /sbin/ldconfig
 
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -145,22 +134,43 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_datadir}/gtk-doc/html/libawn
 %{_bindir}/*
 %{_libdir}/libawn*.so.*
-%config(noreplace) %{_sysconfdir}/gconf/schemas/awn.schemas
-%config(noreplace) %{_sysconfdir}/gconf/schemas/awn-applets-shared.schemas
+%dir %{_libdir}/awn
+%dir %{_libdir}/awn/applets
+%{_libdir}/awn/applets/*/*.so
+%config(noreplace) %{_sysconfdir}/gconf/schemas/avant-window-navigator.schemas
+%config(noreplace) %{_sysconfdir}/gconf/schemas/awn-applet-taskmanager.schemas
 %{_datadir}/applications/*
-%{_datadir}/avant-window-navigator
+%dir %{_datadir}/avant-window-navigator
+%{_datadir}/avant-window-navigator/*
 %{_datadir}/icons/hicolor/*/apps/*
-%{python_sitearch}/awn
+%{_datadir}/icons/hicolor/scalable/categories/awn-plugins.svg
+%dir %{python_sitearch}/awn
+%{python_sitearch}/awn/*
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/libawn
+%doc AUTHORS COPYING COPYING.LIB ChangeLog README
+%dir %{_includedir}/libawn
+%{_includedir}/libawn/*
 %{_libdir}/libawn*.so
 %{_libdir}/pkgconfig/*.pc
+%{_datadir}/pygtk/2.0/defs/awn.defs
 %{_datadir}/vala/vapi/awn.*
 
 
 %changelog
+* Sat Apr 24 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.4.0-1
+- update to 0.4.0
+- update scriptlets
+- drop Br gnome-vfs2-devel gnome-common
+- add Br libgtop2-devel
+- add the libdesktop-agnostic Br and Requires
+- add Requires pkgconfig to devel
+- add requires bzr
+- fix firefox desktop file location
+- add patch to fix unitialized pointer
+- add patch to fix DSO linking
+
 * Tue Feb 09 2010 Leigh Scott <leigh123linux at googlemail.com> - 0.3.2.1-2
 - Add build requires vala
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avant-window-navigator/F-11/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources	4 Feb 2010 18:34:17 -0000	1.7
+++ sources	26 Apr 2010 13:34:14 -0000	1.8
@@ -1 +1 @@
-e1632e4756706e17ebc1958aef002cd0  avant-window-navigator-0.3.2.1.tar.gz
+03654b45dd95cbb83fa7e112bd00523c  avant-window-navigator-0.4.0.tar.gz

