rpms/avant-window-navigator/devel .cvsignore, 1.4, 1.5 avant-window-navigator.spec, 1.7, 1.8 sources, 1.4, 1.5

[Sindre Pedersen Bjørdal (sindrepb)]

Author: sindrepb

Update of /cvs/pkgs/rpms/avant-window-navigator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6416

Modified Files:
	.cvsignore avant-window-navigator.spec sources 
Log Message:
new release, fixes


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/avant-window-navigator/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Nov 2007 20:29:48 -0000	1.4
+++ .cvsignore	17 Mar 2008 01:14:57 -0000	1.5
@@ -1 +1 @@
-avant-window-navigator-0.2.1.tar
+avant-window-navigator-0.2.6.tar.gz


Index: avant-window-navigator.spec
===================================================================
RCS file: /cvs/pkgs/rpms/avant-window-navigator/devel/avant-window-navigator.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- avant-window-navigator.spec	20 Feb 2008 00:08:12 -0000	1.7
+++ avant-window-navigator.spec	17 Mar 2008 01:14:57 -0000	1.8
@@ -1,14 +1,15 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Name:           avant-window-navigator
-Version:        0.2.1
-Release:        3%{?dist}
+Version:        0.2.6
+Release:        1%{?dist}
 Summary:        Fully customisable dock-like window navigator for GNOME
 
 Group:          User Interface/Desktops
-License:        GPL
-URL:            http://code.google.com/p/avant-window-navigator/
-Source0:        https://launchpad.net/awn/0.2/0.2/+download/%{name}-%{version}.tar
+License:        GPLv2+
+URL:            https://launchpad.net/awn
+Source0:        https://launchpad.net/awn/0.2/0.2/+download/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libwnck-devel, pygtk2-devel, GConf2-devel
@@ -45,6 +46,11 @@
 %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
+
 
 %build
 %configure --disable-static
@@ -62,26 +68,49 @@
 desktop-file-install --vendor fedora --delete-original  \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
         --remove-category Application \
-        $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+        $RPM_BUILD_ROOT%{_datadir}/applications/avant-window-navigator.desktop
+
+desktop-file-install --vendor fedora --delete-original  \
+        --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
+        --remove-category Application \
+        $RPM_BUILD_ROOT%{_datadir}/applications/awn-manager.desktop
+
 
 %pre
-#if [ "$1" -gt 1 ]; then
-#    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-#    gconftool-2 --makefile-uninstall-rule \
-#      %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
-#fi
+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
 
 %post
-#export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-#gconftool-2 --makefile-install-rule \
-#  %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/awn.schemas > /dev/null || :
+
+/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
+
 
 %preun
-#if [ "$1" -eq 0 ]; then
-#    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-#    gconftool-2 --makefile-uninstall-rule \
-#      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
-#fi
+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
+
+%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 || :
+fi
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -89,13 +118,15 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog README
+%doc AUTHORS COPYING COPYING.lib ChangeLog README
+%doc %{_datadir}/gtk-doc/html/libawn
 %{_bindir}/*
 %{_libdir}/libawn*.so.*
 %{_libdir}/awn
-# %config(noreplace) %{_sysconfdir}/gconf/schemas/avant-window-navigator.schemas
+%config(noreplace) %{_sysconfdir}/gconf/schemas/awn.schemas
 %{_datadir}/applications/*
 %{_datadir}/avant-window-navigator
+%{_datadir}/icons/hicolor/*/apps/awn-manager*
 
 
 %files devel
@@ -109,6 +140,11 @@
 %{python_sitearch}/awn/
 
 %changelog
+* Tue Feb 19 2008 Sindre Pedersen Bjørdal <sindrepb at fedoraproject.org> - 0.2.6-1
+- New release
+- Re-enable gconf scriplets
+- Add missing scriplets
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.2.1-3
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/avant-window-navigator/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Nov 2007 20:29:48 -0000	1.4
+++ sources	17 Mar 2008 01:14:57 -0000	1.5
@@ -1 +1 @@
-59733ce392d58236338736f6726cac9d  avant-window-navigator-0.2.1.tar
+3e066ba095396673f914b63e022acbb8  avant-window-navigator-0.2.6.tar.gz