updated avant-window-navigator-vl.spec

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4173 ec354946-7b23-47d6-9f5a-488ba84defc7

a/avant-window-navigator/avant-window-navigator-vl.spec

@@ -1,44 +1,44 @@
 # -*- coding: utf-8-unix -*-
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%global bzr bzr830
 
 Name:           avant-window-navigator
-Version:        0.2.6
-Release:        6%{?_dist_release}
+Version:        0.4.1
+Release:        1%{?bzr:.%bzr}%{?_dist_release}
 
 Summary:        Fully customisable dock-like window navigator for GNOME
-Summary(ja):    Gnome + Compiz 向けの Dock 機能を兼ね備えたウィンドウナビゲータ
 
 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/0.2/+download/%{name}-%{version}.tar.gz
-#fixes schemas file
-Patch0:         avant-window-navigator-schemas.patch
-#fixes issue where awn only appears on one desktop, #469032
-Patch1:         avant-window-navigator-0.2.6-sticky.patch
+# upstream snapshot: 
+# bzr branch lp:awn
+# bzr export --root=avant-window-navigator-0.4.1-bzr830 avant-window-navigator-0.4.1-bzr830.tar.gz
+#
+Source0:       %{name}-%{version}-%{bzr}.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 
 BuildRequires:  libwnck-devel 
 BuildRequires:  dbus-glib-devel
-BuildRequires:  gnome-common 
 BuildRequires:  pygtk2-devel 
+BuildRequires:  pycairo-devel
 BuildRequires:  GConf2-devel 
 BuildRequires:  startup-notification-devel
-BuildRequires:  gnome-desktop-devel >= 2.26.0
-BuildRequires:  libgnome-devel
-BuildRequires:  gnome-vfs2-devel 
-BuildRequires:  gnome-python
+BuildRequires:  gnome-desktop-devel libgnome-devel gnome-python
 BuildRequires:  libXdamage-devel libXcomposite-devel libXres-devel 
 BuildRequires:  gettext, intltool
 BuildRequires:  desktop-file-utils
-BuildRequires:  pyxdg
-BuildRequires:  pycairo-devel
-
-Requires:       gnome-python-gnomedesktop, pyxdg
-#Requires:       gnome-python-gconf
+BuildRequires:  pyxdg libgtop2-devel
+BuildRequires:  libdesktop-agnostic-bin >= 0.3.91
+BuildRequires:  libdesktop-agnostic-devel >= 0.3.91
+BuildRequires:  vala
+BuildRequires:  libtool
+
+Requires:       gnome-python, gnome-python-gnomedesktop, pyxdg
+Requires:       libdesktop-agnostic-bin >= 0.3.91
+Requires:       python-desktop-agnostic >= 0.3.91
 Requires(pre):  GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -47,12 +47,6 @@ Requires(preun): GConf2
 Avant Window Navgator (Awn) is a dock-like bar which sits at the bottom of 
 the screen (in all its composited-goodness) tracking open windows.
 
-%description -l ja
-Avant Window Navgator (Awn) は、
-Gnome + Compiz 向けの Dock 機能を兼ね備えたウィンドウナビゲータバーです。
-起動しているアプリケーションウィンドウを追跡し、
-画面下部に並べます。
-
 %package devel
 Summary:    Fully customisable dock-like window navigator for GNOME
 Group:      Development/Libraries
@@ -62,31 +56,35 @@ Requires:   %{name} = %{version}-%{release}
 This package includes all header files and library of AWN for development.
 
 %prep
-%setup -q
-%patch0 -p1
-%patch1 -p0
-
-#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
+%setup -q -n %{name}-%{version}%{?bzr:-%{bzr}}
 
 
 %build
+intltoolize --copy --force --automake
+gtkdocize --copy
+autoreconf --force --install
+
 %configure \
     --disable-static \
-    --disable-schemas \
+    --with-gnu-ld \
+    --with-vala \
+    --disable-shave \
     ;
-
-#make %{?_smp_mflags}
-%__make
+%__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}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_  _INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
-find ${RPM_BUILD_ROOT} -name '*.la' | xargs rm
+%__rm -rf $RPM_BUILD_ROOT
+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}
 
@@ -98,80 +96,107 @@ desktop-file-install --vendor vine --delete-original  \
 desktop-file-install --vendor vine --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
+##obsolete schemas: awn awn-applets-shared
+for schema in awn awn-applets-shared; do
+    if [ -f %{_sysconfdir}/gconf/schemas/${schema}.schemas ]; then
+        export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+        gconftool-2 --makefile-uninstall-rule \
+            %{_sysconfdir}/gconf/schemas/${schema}.schemas >/dev/null || :
+    fi
+done
+
 
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/awn.schemas > /dev/null || :
+##upgrade schemas: 
+##avant-window-navigator awn-applet-taskmanager awn-applet-simple-launcher
+for schema in avant-window-navigator \
+              awn-applet-taskmanager \
+              awn-applet-simple-launcher; do
+    if [ -f %{_sysconfdir}/gconf/schemas/${schema}.schemas ]; then
+        export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+        gconftool-2 --makefile-install-rule \
+            %{_sysconfdir}/gconf/schemas/${schema}.schemas >/dev/null || :
+    fi
+done
 
 /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 || :
+    for schema in avant-window-navigator \
+                  awn-applet-taskmanager \
+		  awn-applet-simple-launcher; do
+        if [ -f %{_sysconfdir}/gconf/schemas/${schema}.schemas ]; then
+	    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+            gconftool-2 --makefile-uninstall-rule \
+	        %{_sysconfdir}/gconf/schemas/${schema}.schemas >/dev/null || :
+        fi
+    done
 fi
 
 
 %postun
 /sbin/ldconfig
 
-touch --no-create %{_datadir}/icons/hicolor
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+      %{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+    fi
+fi
+
+
+%posttrans
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%__rm -rf $RPM_BUILD_ROOT
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog README
-%doc %{_datadir}/gtk-doc/html/libawn
+#%doc %{_datadir}/gtk-doc/html/libawn
 %{_bindir}/*
 %{_libdir}/libawn*.so.*
-%{_libdir}/awn
-%config(noreplace) %{_sysconfdir}/gconf/schemas/awn.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
+%config(noreplace) %{_sysconfdir}/gconf/schemas/awn-applet-simple-launcher.schemas
 %{_datadir}/applications/*
-%{_datadir}/avant-window-navigator
-%{_datadir}/icons/hicolor/*/apps/awn-manager*
-%{python_sitelib}/awn
-
+%dir %{_datadir}/avant-window-navigator
+%{_datadir}/avant-window-navigator/*
+%{_datadir}/icons/hicolor/*/apps/*
+%{_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
-* Mon Sep 27 2010 Shu KONNO <owa@bg.wakwak.com> 0.2.6-6
-- rebuilt with rpm-4.8.1 for pkg-config
-
-* Mon Apr 19 2010 Shu KONNO <owa@bg.wakwak.com> 0.2.6-5
-- rebuilt with python-2.6
-
-* Mon Jul 26 2009 Munehiro Yamamoto <munepi@vinelinux.org> 0.2.6-4
-- added Summary(ja) and %%description -l ja
+* Sat Jun 18 2011 Munehiro Yamamoto <munepi@cg8.so-net.ne.jp> 0.4.1-1.bzr830
+- updated to source 0.4.1 (bzr830) based on Fedora rawhide
 
 * Sun Mar 22 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 0.2.6-3
 - rebuild with gnome-desktop-2.26.0