rpms/pessulus/devel pessulus-2.23.1-use-pythondir.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 pessulus.spec, 1.15, 1.16 sources, 1.8, 1.9

Thu Aug 28 17:11:22 UTC 2008

Author: spot

Update of /cvs/pkgs/rpms/pessulus/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17872

Modified Files:
	.cvsignore pessulus.spec sources 
Added Files:
	pessulus-2.23.1-use-pythondir.patch 
Log Message:
update to 2.23.1, fix license tag

pessulus-2.23.1-use-pythondir.patch:

--- NEW FILE pessulus-2.23.1-use-pythondir.patch ---
diff -up pessulus-2.23.1/Makefile.am.BAD pessulus-2.23.1/Makefile.am
--- pessulus-2.23.1/Makefile.am.BAD	2008-08-28 12:50:52.000000000 -0400
+++ pessulus-2.23.1/Makefile.am	2008-08-28 12:51:04.000000000 -0400
@@ -5,7 +5,7 @@ SUBDIRS = data po Pessulus
 bin_SCRIPTS = pessulus
 
 pessulus: pessulus.in Makefile
-	sed -e s!\@pyexecdir\@!@pyexecdir@! -e s!\@PYTHON\@!@PYTHON@! < $< > $@
+	sed -e s!\@pythondir\@!@pythondir@! -e s!\@PYTHON\@!@PYTHON@! < $< > $@
 	chmod a+x $@
 
 EXTRA_DIST =			\
diff -up pessulus-2.23.1/Makefile.in.BAD pessulus-2.23.1/Makefile.in
--- pessulus-2.23.1/Makefile.in.BAD	2008-08-28 12:51:35.000000000 -0400
+++ pessulus-2.23.1/Makefile.in	2008-08-28 12:51:46.000000000 -0400
@@ -680,7 +680,7 @@ uninstall-am: uninstall-binSCRIPTS
 
 
 pessulus: pessulus.in Makefile
-	sed -e s!\@pyexecdir\@!@pyexecdir@! -e s!\@PYTHON\@!@PYTHON@! < $< > $@
+	sed -e s!\@pythondir\@!@pythondir@! -e s!\@PYTHON\@!@PYTHON@! < $< > $@
 	chmod a+x $@
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -up pessulus-2.23.1/pessulus.in.BAD pessulus-2.23.1/pessulus.in
--- pessulus-2.23.1/pessulus.in.BAD	2008-08-28 12:50:11.000000000 -0400
+++ pessulus-2.23.1/pessulus.in	2008-08-28 12:50:28.000000000 -0400
@@ -24,8 +24,8 @@ import bugbuddy
 
 bugbuddy.install()
 
-if not "@pyexecdir@" in sys.path:
-    sys.path.insert (0, "@pyexecdir@")
+if not "@pythondir@" in sys.path:
+    sys.path.insert (0, "@pythondir@")
 
 
 import Pessulus.main
diff -up pessulus-2.23.1/Pessulus/Makefile.am.BAD pessulus-2.23.1/Pessulus/Makefile.am
--- pessulus-2.23.1/Pessulus/Makefile.am.BAD	2008-08-28 12:52:16.000000000 -0400
+++ pessulus-2.23.1/Pessulus/Makefile.am	2008-08-28 12:52:30.000000000 -0400
@@ -1,4 +1,4 @@
-appdir = $(pyexecdir)/Pessulus
+appdir = $(pythondir)/Pessulus
 
 app_PYTHON = 			\
 	__init__.py		\
diff -up pessulus-2.23.1/Pessulus/Makefile.in.BAD pessulus-2.23.1/Pessulus/Makefile.in
--- pessulus-2.23.1/Pessulus/Makefile.in.BAD	2008-08-28 12:52:35.000000000 -0400
+++ pessulus-2.23.1/Pessulus/Makefile.in	2008-08-28 12:52:51.000000000 -0400
@@ -193,7 +193,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-appdir = $(pyexecdir)/Pessulus
+appdir = $(pythondir)/Pessulus
 app_PYTHON = \
 	__init__.py		\
 	disabledapplets.py	\


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pessulus/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	22 Dec 2006 19:43:15 -0000	1.8
+++ .cvsignore	28 Aug 2008 17:10:52 -0000	1.9
@@ -1 +1 @@
-pessulus-2.16.2.tar.bz2
+pessulus-2.23.1.tar.bz2


Index: pessulus.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pessulus/devel/pessulus.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- pessulus.spec	16 Apr 2007 15:25:39 -0000	1.15
+++ pessulus.spec	28 Aug 2008 17:10:52 -0000	1.16
@@ -1,20 +1,23 @@
-%{!?python_sitearch: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%define basever 2.23
 
 Name:           pessulus
-Version:        2.16.2
-Release:        2%{?dist}
+Version:        %{basever}.1
+Release:        1%{?dist}
 Summary:        A lockdown editor for GNOME
 
 Group:          Applications/System
-License:        GPL
+License:        GPLv2+
 URL:            http://live.gnome.org/Pessulus
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{basever}/%{name}-%{version}.tar.bz2
+# Filed upstream:
+# http://bugzilla.gnome.org/show_bug.cgi?id=549728
+Patch0:         pessulus-2.23.1-use-pythondir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
 BuildRequires:	gtk2-devel, pygtk2-devel, gnome-python2-devel, gnome-python2-gconf, perl-XML-Parser, pkgconfig, desktop-file-utils, GConf2-devel, gettext-devel
-Requires: gnome-python2-gconf
+Requires: gnome-python2-gconf, gnome-python2-bugbuddy
 
 %description
 Pessulus is a lockdown editor for GNOME, written in python. Pessulus 
@@ -25,6 +28,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .use-pythondir
 
 
 %build
@@ -46,6 +50,18 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc README AUTHORS COPYING ChangeLog
@@ -53,8 +69,14 @@
 %{python_sitelib}/Pessulus/
 %{_datadir}/applications/*.desktop
 %{_datadir}/%{name}
+%{_datadir}/icons/hicolor/*/apps/pessulus.*
 
 %changelog
+* Thu Aug 28 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.23.1-1
+- fix license tag
+- update to 2.23.1
+- install into pythondir (not pyexecdir)
+
 * Mon Apr 16 2007 Damien Durand <splinux at fedoraproject.org> - 2.16.2-2
 - Fix desktop-file
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pessulus/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	22 Dec 2006 19:43:15 -0000	1.8
+++ sources	28 Aug 2008 17:10:52 -0000	1.9
@@ -1 +1 @@
-baefae82c57576c5abaa2a57a9a77318  pessulus-2.16.2.tar.bz2
+f92bd054660e8bd3e99ef9788ae2678d  pessulus-2.23.1.tar.bz2


