rpms/pygobject2/devel .cvsignore, 1.27, 1.28 pygobject2.spec, 1.65, 1.66 sources, 1.27, 1.28 Clear-error-if-we-failed-import.patch, 1.1, NONE Don-t-raise-an-error-in-_pygi_import-if-pygi-support-is-disabled.patch, 1.1, NONE

[Colin Walters]

Author: walters

Update of /cvs/pkgs/rpms/pygobject2/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7548

Modified Files:
	.cvsignore pygobject2.spec sources 
Removed Files:
	Clear-error-if-we-failed-import.patch 
	Don-t-raise-an-error-in-_pygi_import-if-pygi-support-is-disabled.patch 
Log Message:
* Wed Jul  7 2010 Colin Walters <walters at verbum.org> - 2.21.4-1
- Update to latest upstream
- Drop upstreamed patches
- Drop libtool overriding; was not commented and seems fine
  without
- Drop --enable-thread, it's default now
- Drop --enable-pygi, it's default now
- Drop clean section, no longer needed in F-14
- Drop python-sitearch copy&paste, no longer needed in F-14



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/.cvsignore,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- .cvsignore	3 Jan 2010 03:47:13 -0000	1.27
+++ .cvsignore	7 Jul 2010 14:24:40 -0000	1.28
@@ -1 +1 @@
-pygobject-2.21.1.tar.bz2
+pygobject-2.21.4.tar.bz2


Index: pygobject2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/pygobject2.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- pygobject2.spec	27 May 2010 14:36:37 -0000	1.65
+++ pygobject2.spec	7 Jul 2010 14:24:40 -0000	1.66
@@ -1,5 +1,3 @@
-%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
 # Last updated for version 2.21.0
 %define glib2_version                  2.22.4
 %define gobject_introspection_version  0.6.3
@@ -14,17 +12,14 @@
 ### Abstract ###
 
 Name: pygobject2
-Version: 2.21.1
-Release: 9%{?dist}
+Version: 2.21.4
+Release: 2%{?dist}
 License: LGPLv2+
 Group: Development/Languages
 Summary: Python bindings for GObject
 URL: http://www.pygtk.org/
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 #VCS: git:git://git.gnome.org/pygobject
-Patch1: Don-t-raise-an-error-in-_pygi_import-if-pygi-support-is-disabled.patch
-# https://bugzilla.gnome.org/show_bug.cgi?id=617796
-Patch2: Clear-error-if-we-failed-import.patch
 Source: http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.21/pygobject-%{version}.tar.bz2
 
 ### Build Dependencies ###
@@ -72,25 +67,19 @@ This package contains documentation file
 
 %prep
 %setup -q -n pygobject-%{version}
-%patch1 -p1
-%patch2 -p1
 
 %build
-%configure --enable-thread --enable-pygi
-export tagname=CC
-make LIBTOOL=/usr/bin/libtool
+%configure
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-export tagname=CC
-make LIBTOOL=/usr/bin/libtool DESTDIR=$RPM_BUILD_ROOT install
-find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
+make DESTDIR=$RPM_BUILD_ROOT install
+find $RPM_BUILD_ROOT -name '*.la' -delete
+find $RPM_BUILD_ROOT -name '*.a' -delete
 
 rm examples/Makefile*
 
-%clean
-rm -fr $RPM_BUILD_ROOT
-
 %files
 %defattr(644, root, root, 755)
 %doc AUTHORS NEWS README
@@ -98,14 +87,9 @@ rm -fr $RPM_BUILD_ROOT
 
 %{_libdir}/libpyglib-2.0-python.so*
 %dir %{python_sitearch}/gtk-2.0
-%{python_sitearch}/gtk-2.0/dsextras.*
+%{python_sitearch}/gtk-2.0/*
 %{python_sitearch}/pygtk.*
 
-%defattr(755, root, root, 755)
-%{python_sitearch}/gtk-2.0/gio
-%{python_sitearch}/gtk-2.0/glib
-%{python_sitearch}/gtk-2.0/gobject
-
 %files codegen
 %defattr(755, root, root, 755)
 %{_bindir}/pygobject-codegen-2.0
@@ -128,6 +112,16 @@ rm -fr $RPM_BUILD_ROOT
 %{_datadir}/pygobject/xsl
 
 %changelog
+* Wed Jul  7 2010 Colin Walters <walters at verbum.org> - 2.21.4-1
+- Update to latest upstream
+- Drop upstreamed patches
+- Drop libtool overriding; was not commented and seems fine
+  without
+- Drop --enable-thread, it's default now
+- Drop --enable-pygi, it's default now
+- Drop clean section, no longer needed in F-14
+- Drop python-sitearch copy&paste, no longer needed in F-14
+
 * Thu May 27 2010 Colin Walters <walters at verbum.org> - 2.21.1-9
 - Readd my patch to not blow up mysteriously
   Resolves: #596392


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pygobject2/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources	3 Jan 2010 03:47:13 -0000	1.27
+++ sources	7 Jul 2010 14:24:41 -0000	1.28
@@ -1 +1 @@
-c12eef0cd6725dc7245c3db78ef85d2d  pygobject-2.21.1.tar.bz2
+fae9b01b939621ae211810652cd86726  pygobject-2.21.4.tar.bz2


--- Clear-error-if-we-failed-import.patch DELETED ---


--- Don-t-raise-an-error-in-_pygi_import-if-pygi-support-is-disabled.patch DELETED ---