rpms/gnome-blog/devel gnome-blog-poster.patch, NONE, 1.1 gnome-blog_makefile.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 gnome-blog.spec, 1.5, 1.6 sources, 1.2, 1.3

Brian Pepple (bpepple) fedora-extras-commits at redhat.com
Sun Mar 13 02:02:35 UTC 2005


Author: bpepple

Update of /cvs/extras/rpms/gnome-blog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12094/devel

Modified Files:
	.cvsignore gnome-blog.spec sources 
Added Files:
	gnome-blog-poster.patch gnome-blog_makefile.patch 
Log Message:
auto-import gnome-blog-0.8-5 on branch devel from gnome-blog-0.8-5.src.rpm

gnome-blog-poster.patch:

--- NEW FILE gnome-blog-poster.patch ---
--- gnome-blog-0.8/gnome-blog-poster.init	2005-02-06 10:31:26.777409742 -0500
+++ gnome-blog-0.8/gnome-blog-poster	2005-02-06 10:32:16.018009917 -0500
@@ -26,12 +26,6 @@
     def __init__(self):
         self.prefs_key = "/apps/gnome-blog"
 
-        client = gconf.client_get_default()
-        value = client.get_bool(self.prefs_key + "/initialized")
-        if (value == None or value == gtk.FALSE):
-            poster._showPrefDialog()
-            client.set_bool(self.prefs_key + "/initialized", gtk.TRUE)
-        
         poster_window = gtk.Window(gtk.WINDOW_TOPLEVEL)
         poster_window.set_title(_("Post Blog Entry"))
         poster_window.connect('destroy', lambda w: gtk.main_quit())
@@ -42,6 +36,12 @@
                                         accel_group=accel_group,
                                         on_entry_posted=self._onEntryPosted)
         
+        client = gconf.client_get_default()
+        value = client.get_bool(self.prefs_key + "/initialized")
+        if (value == None or value == gtk.FALSE):
+            poster._showPrefDialog()
+            client.set_bool(self.prefs_key + "/initialized", gtk.TRUE)
+        
         poster_window.add(poster)
         poster_window.show_all()
 

gnome-blog_makefile.patch:

--- NEW FILE gnome-blog_makefile.patch ---
--- gnome-blog-0.8/Makefile.in.bytec	2005-01-02 02:29:50.000000000 -0500
+++ gnome-blog-0.8/Makefile.in	2005-01-13 09:18:25.993552717 -0500
@@ -397,7 +397,7 @@
 	  else :; fi; \
 	done; \
 	test -z "$$dlist" || \
-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(gnomeblogdir)" $$dlist
+	    PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(gnomeblogdir)" $$dlist
 
 uninstall-gnomeblogPYTHON:
 	@$(NORMAL_UNINSTALL)
--- gnome-blog-0.8/py-compile.bytec	2004-11-01 12:26:10.000000000 -0500
+++ gnome-blog-0.8/py-compile	2005-01-13 09:15:53.949455705 -0500
@@ -1,7 +1,7 @@
 #!/bin/sh
 # py-compile - Compile a Python program
 
-scriptversion=2004-01-12.23
+scriptversion=2004-12-05.17
 
 # Copyright (C) 2000, 2001, 2003, 2004  Free Software Foundation, Inc.
 
@@ -34,34 +34,54 @@
 fi
 
 basedir=
+destdir=
+files=
+while test $# -ne 0; do
+  case "$1" in
+    --basedir)
+      basedir=$2
+      if test -z "$basedir"; then
+        echo "$0: Missing argument to --basedir." 1>&2
+        exit 1
+      fi
+      shift
+      ;;
+    --destdir)
+      destdir=$2
+      if test -z "$destdir"; then
+        echo "$0: Missing argument to --destdir." 1>&2
+        exit 1
+      fi
+      shift
+      ;;
+    -h|--h*)
+      cat <<\EOF
+Usage: py-compile [--help] [--version] [--basedir DIR] [--destdir DIR] FILES..."
+
+Byte compile some python scripts FILES.  Use --destdir to specify any
+leading directory path to the FILES that you don't want to include in the
+byte compiled file.  Specify --basedir for any additional path information you
+do want to be shown in the byte compiled file.
 
-case "$1" in
-  --basedir)
-    basedir=$2
-    if test -z "$basedir"; then
-      echo "$0: Missing argument to --basedir." 1>&2
-      exit 1
-    fi
-    shift 2
-    ;;
-  -h|--h*)
-    cat <<\EOF
-Usage: py-compile [--help] [--version] [--basedir DIR] FILES..."
-
-Byte compile some python scripts FILES.  This should be performed
-after they have been moved to the final installation location
+Example:
+  py-compile --destdir /tmp/pkg-root --basedir /usr/share/test test.py test2.py
 
 Report bugs to <bug-automake at gnu.org>.
 EOF
-    exit 0
-    ;;
-  -v|--v*)
-    echo "py-compile $scriptversion"
-    exit 0
-    ;;
-esac
+      exit 0
+      ;;
+    -v|--v*)
+      echo "py-compile $scriptversion"
+      exit 0
+      ;;
+    *)
+      files="$files $1"
+      ;;
+  esac
+  shift
+done
 
-if [ $# = 0 ]; then
+if test -z "$files"; then
     echo "$0: No files given.  Try \`$0 --help' for more information." 1>&2
     exit 1
 fi
@@ -69,38 +89,51 @@
 # if basedir was given, then it should be prepended to filenames before
 # byte compilation.
 if [ -z "$basedir" ]; then
-    trans="path = file"
+    pathtrans="path = file"
 else
-    trans="path = os.path.join('$basedir', file)"
+    pathtrans="path = os.path.join('$basedir', file)"
+fi
+
+# if destdir was given, then it needs to be prepended to the filename to
+# byte compile but not go into the compiled file.
+if [ -z "$destdir" ]; then
+    filetrans="filepath = path"
+else
+    filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)"
 fi
 
 $PYTHON -c "
 import sys, os, string, py_compile
 
-files = '''$*'''
+files = '''$files'''
+
 print 'Byte-compiling python modules...'
 for file in string.split(files):
-    $trans
-    if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
+    $pathtrans
+    $filetrans
+    if not os.path.exists(filepath) or not (len(filepath) >= 3
+                                            and filepath[-3:] == '.py'):
 	continue
     print file,
     sys.stdout.flush()
-    py_compile.compile(path)
+    py_compile.compile(filepath, filepath + 'c', path)
 print" || exit $?
 
 # this will fail for python < 1.5, but that doesn't matter ...
 $PYTHON -O -c "
 import sys, os, string, py_compile
 
-files = '''$*'''
+files = '''$files'''
 print 'Byte-compiling python modules (optimized versions) ...'
 for file in string.split(files):
-    $trans
-    if not os.path.exists(path) or not (len(path) >= 3 and path[-3:] == '.py'):
+    $pathtrans
+    $filetrans
+    if not os.path.exists(filepath) or not (len(filepath) >= 3
+                                            and filepath[-3:] == '.py'):
 	continue
     print file,
     sys.stdout.flush()
-    py_compile.compile(path)
+    py_compile.compile(filepath, filepath + 'o', path)
 print" 2>/dev/null || :
 
 # Local Variables:
--- gnome-blog-0.8/protocols/Makefile.in.bytec	2005-01-13 09:16:10.365997809 -0500
+++ gnome-blog-0.8/protocols/Makefile.in	2005-01-13 09:16:44.221928753 -0500
@@ -237,7 +237,7 @@
 	  else :; fi; \
 	done; \
 	test -z "$$dlist" || \
-	PYTHON=$(PYTHON) $(py_compile) --basedir "$(DESTDIR)$(gnomeblogdir)" $$dlist
+	PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir "$(gnomeblogdir)" $$dlist
 
 uninstall-gnomeblogPYTHON:
 	@$(NORMAL_UNINSTALL)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:27:19 -0000	1.2
+++ .cvsignore	13 Mar 2005 02:02:33 -0000	1.3
@@ -1 +1 @@
-gnome-blog-0.7.tar.gz
+gnome-blog-0.8.tar.gz


Index: gnome-blog.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/devel/gnome-blog.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-blog.spec	4 Mar 2005 21:00:23 -0000	1.5
+++ gnome-blog.spec	13 Mar 2005 02:02:33 -0000	1.6
@@ -1,23 +1,27 @@
 %define gnome_python2_version 1.99.13
 %define pyver %(python -c 'import sys ; print sys.version[:3]')
-%define pynext %(python -c 'print %{pyver} + 0.1')
+%{!?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:		gnome-blog
-Version:	0.7
-Release:	7
+Version:	0.8
+Release:	5
 Summary:	GNOME panel object for posting blog entries
 
-Group:		User Interface/Desktops
+Group:		Applications/Internet
 License:	GPL
 URL:		http://www.gnome.org/~seth/gnome-blog/		
-Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-blog/0.7/gnome-blog-0.7.tar.gz
+Source0:	http://ftp.gnome.org/pub/gnome/sources/gnome-blog/0.8/gnome-blog-0.8.tar.gz
+Patch1:		gnome-blog_makefile.patch
+Patch2:		gnome-blog-poster.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
 Requires:	gnome-python2-applet >= %{gnome_python2_version}
 Requires:	gnome-python2-gconf  >= %{gnome_python2_version}
+Requires:	gnome-python2-gnomevfs >= %{gnome_python2_version}
 Requires:	pygtk2 >= %{gnome_python2_version}
-Requires:	python >= %{pyver}, python <= %{pynext}
+Requires:	python-abi = %{pyver}
 
 Requires(post):	GConf2
 Requires(preun): GConf2
@@ -27,42 +31,42 @@
 BuildRequires:	gettext
 BuildRequires:	GConf2
 BuildRequires:	desktop-file-utils
+BuildRequires:	intltool
 
 %description
 GNOME panel object that allows convenient posting of blog entries to
 any blog that supports the bloggerAPI.
 
-
 %prep
 %setup -q
-%{__sed} -i 's|\(<oaf_server iid="OAFIID:GNOME_BlogApplet_Factory" type="exe" location="\)\(blog_applet.py">\)|\1%{_libexecdir}/\2|' GNOME_BlogApplet.server.in
-
+%patch1 -p1
+%patch2 -p1
 
 %build
 %configure
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 %find_lang %{name}
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
 # gnome-blog makefile installs this, but we have to add some extra stuff for
 # fedora compliance
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/gnome-blog.desktop
-desktop-file-install --vendor=fedora --dir=$RPM_BUILD_ROOT%{_datadir}/applications --add-category=X-Fedora --add-category=Network gnome-blog.desktop
-
-# Panel applets belong in /usr/libexec rather than /usr/bin
-%{__mkdir_p} $RPM_BUILD_ROOT%{_libexecdir}
-%{__mv} $RPM_BUILD_ROOT%{_bindir}/blog_applet.py $RPM_BUILD_ROOT%{_libexecdir}
+desktop-file-install --vendor=fedora			\
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications		\
+  --add-category=X-Fedora --add-category=Network	\
+  %{name}.desktop
 
+# This is a program file and doesn't need to be placed in the library path
+rm -f $RPM_BUILD_ROOT/%{python_sitelib}/gnomeblog/gnome-blog-poster
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gnomeblog.schemas &> /dev/null || :
@@ -73,27 +77,44 @@
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/gnomeblog.schemas &> /dev/null || :
 unset GCONF_CONFIG_SOURCES
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README
 %{_bindir}/*
 %{_libexecdir}/*
 %{_sysconfdir}/gconf/schemas/gnomeblog.schemas
-%{_datadir}/pixmaps/gnome-blog.png
+%{_datadir}/pixmaps/%{name}.png
 %{_datadir}/gnome-2.0/ui/*.xml
 %{_datadir}/applications/*.desktop
 %{_libdir}/bonobo/servers/*.server
-%dir %{_libdir}/python%{pyver}/site-packages/gnomeblog
-%{_libdir}/python%{pyver}/site-packages/gnomeblog/*.py
-%{_libdir}/python%{pyver}/site-packages/gnomeblog/gnome-blog-poster
-%{_libdir}/python%{pyver}/site-packages/gnomeblog/*.pyc
-%ghost %{_libdir}/python*/site-packages/gnomeblog/*.pyo
-
+%dir %{python_sitelib}/gnomeblog
+%{python_sitelib}/gnomeblog/*.py
+%{python_sitelib}/gnomeblog/*.pyc
+%ghost %{python_sitelib}/gnomeblog/*.pyo
 
 %changelog
-* Fri Mar  4 2005 Ville Skyttä <ville.skytta at iki.fi>
-- Split context marked dependency syntax to work around #118773.
+* Tue Mar  1 2005 Brian Pepple <bdpepple at ameritech.net> - 0.8-5
+- Add build requires: intltool
+- Drop epoch: 0.
+
+* Mon Feb  7 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.8-4
+- Added patch to correct blog-poster bug.(#2377c5)
+
+* Thu Feb 03 2005 Toshio Kuratomi <toshio at tiki-lounge.com> - 0:0.8-0.fdr.3
+- No longer include gnome-blog-poster in the library path.  It only belongs
+  in the bindir.
+- Switch to the new python macros for python-abi.
+- Switch to python_sitelib in the files section.  Makes gnome-blog build on
+  x86_64.
+- Change group to Applications/Internet.
+
+* Thu Jan 13 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.8-0.fdr.2
+- Added makefile patch to fix python byte compiling from Toshio Kuratomi (#2377).
+
+* Wed Jan 12 2005 Brian Pepple <bdpepple at gmail.com> - 0:0.8-0.fdr.1
+- Updated to 0.8.
+- Removed code from spec file that fixed location of blog_applet.py, since this was corrected upstream.
+- Added requires for gnome-python2-gnomevfs.
 
 * Tue Feb  3 2004 Brian Pepple <bdpepple at ameritech.net> 0:0.7-0.fdr.7
 - Removed Requires: GConf2, and replaced with Requires(post,preun).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-blog/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:27:19 -0000	1.2
+++ sources	13 Mar 2005 02:02:33 -0000	1.3
@@ -1 +1 @@
-0aad0b5b0b3c59bb70ca6f5f9f81c170  gnome-blog-0.7.tar.gz
+d8e8a451f8e7fd4b1af49a6346301e2a  gnome-blog-0.8.tar.gz




More information about the scm-commits mailing list