rpms/gazpacho/devel gazpacho-0.6.1-installroot.patch, NONE, 1.1 gazpacho-0.6.1-nox.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 gazpacho.spec, 1.11, 1.12 sources, 1.6, 1.7
Jeremy Katz (katzj)
fedora-extras-commits at redhat.com
Fri Aug 19 17:45:55 UTC 2005
Author: katzj
Update of /cvs/extras/rpms/gazpacho/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27062
Modified Files:
.cvsignore gazpacho.spec sources
Added Files:
gazpacho-0.6.1-installroot.patch gazpacho-0.6.1-nox.patch
Log Message:
update to 0.6.1. add patch from upstream svn to fix where __installed__ gets
created. patch build to not require X. hack around brp-python-bytecompile
creating .py[co] files in %{_docdir}
gazpacho-0.6.1-installroot.patch:
--- NEW FILE gazpacho-0.6.1-installroot.patch ---
Index: setup.py
===================================================================
--- setup.py (revision 1656)
+++ setup.py (revision 1657)
@@ -60,20 +60,9 @@
glade_dir = os.path.join(prefix, 'share', 'gazpacho', 'glade')
docs_dir = os.path.join(prefix, 'share', 'doc', 'gazpacho')
'''
- filename = os.path.join(self.build_dir, 'gazpacho',
+ filename = os.path.join(self.install_dir, 'gazpacho',
'__installed__.py')
install = self.distribution.get_command_obj('install')
- # Overkill: Don't generate the file if we have the same prefix
- if (os.path.exists(filename) and not newer(__file__, filename)):
- d = {}
- try:
- # This may have security implications, but do we care?
- execfile(filename, {}, d)
- except Exception, e:
- raise SystemExit('Error: %s' % e)
- if d.get('prefix') == install.prefix:
- return install_lib.install(self)
-
self.mkpath(os.path.dirname(filename))
fp = open(filename, 'w')
fp.write(installed_template % dict(prefix=install.prefix))
gazpacho-0.6.1-nox.patch:
--- NEW FILE gazpacho-0.6.1-nox.patch ---
--- gazpacho-0.6.1/setup.py.nox 2005-08-15 11:56:27.000000000 -0400
+++ gazpacho-0.6.1/setup.py 2005-08-15 11:56:42.000000000 -0400
@@ -9,8 +9,6 @@
import sys
import shutil
-from gazpacho import application
-
def listfiles(*dirs):
dir, pattern = os.path.split(os.path.join(*dirs))
return [os.path.join(dir, filename)
@@ -108,7 +106,7 @@
['gazpacho.desktop']))
setup(name='gazpacho',
- version=application.__version__,
+ version="0.6.1",
description='GTK+ GUI Designer',
author='SICEm S.L.',
author_email='lgs at sicem.biz',
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 15 Apr 2005 02:33:11 -0000 1.6
+++ .cvsignore 19 Aug 2005 17:45:53 -0000 1.7
@@ -1 +1 @@
-gazpacho-0.5.3.tar.bz2
+gazpacho-0.6.1.tar.bz2
Index: gazpacho.spec
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/gazpacho.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gazpacho.spec 15 Apr 2005 02:37:11 -0000 1.11
+++ gazpacho.spec 19 Aug 2005 17:45:53 -0000 1.12
@@ -2,25 +2,38 @@
Summary: Glade Interface Creator
Name: gazpacho
-Version: 0.5.3
-Release: 2
+Version: 0.6.1
+Release: 1%{?dist}
License: GPL
Group: Development/Tools
URL: http://gazpacho.sicem.biz/
Provides: Gazpacho = %{version}-%{release}
Source0: ftp://ftp.gnome.org/pub/gnome/sources/gazpacho/gazpacho-%{version}.tar.bz2
+Patch0: gazpacho-0.6.1-nox.patch
+# already upstream, remove for next release
+Patch1: gazpacho-0.6.1-installroot.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
Requires: pygtk2 >= 2.4.0, pygtk2-libglade
Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
+# hrm, the brp-python-bytecompile will byte-compile docs stuff too
+# which is probably not what we want
+%define __os_install_post \
+ [ -x /usr/lib/rpm/brp-python-bytecompile ] && /usr/lib/rpm/brp-python-bytecompile \
+ rm -f $RPM_BUILD_ROOT/%{_docdir}/gazpacho/examples/*.py[co] \
+%{nil}
+
+
%description
This program allows you to create the Graphical User Interface (GUI) of your
GTK+ program in a visual way. Yes, it is a Glade-3 clone. It is compatible with
libglade.
%prep
-%setup -q -n Gazpacho-%{version}
+%setup -q
+%patch0 -p1 -b .nox
+%patch1 -p0
%build
python ./setup.py build
@@ -38,10 +51,16 @@
%files -f %{name}-%{version}.files
%defattr(-,root,root,-)
-%doc README COPYING NEWS
+%doc README COPYING NEWS
+# this will go away in the next version
+/usr/lib/gazpacho/widgets/gtk+.py[co]
+%{python_sitelib}/gazpacho/__installed__.py*
%changelog
+* Fri Aug 19 2005 Jeremy Katz <katzj at redhat.com> - 0.6.1
+- update to 0.6.1
+
* Thu Apr 14 2005 Jeremy Katz <katzj at redhat.com> - 0.5.3-2
- rebuild for devel
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gazpacho/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 15 Apr 2005 02:33:11 -0000 1.6
+++ sources 19 Aug 2005 17:45:53 -0000 1.7
@@ -1 +1 @@
-2116623fc44d11fc775679d2f5d25c6a gazpacho-0.5.3.tar.bz2
+71c53c5ada604c729233ea0b0bcb731e gazpacho-0.6.1.tar.bz2
More information about the fedora-extras-commits
mailing list