[shiboken/el6] 0.5.0 import

Thu Jun 27 08:15:50 UTC 2013

commit 73ea786f82014a8fa4719c60dca4a6b43359e733
Author: Than Ngo <than at redhat.com>
Date:   Thu Jun 27 10:15:15 2013 +0200

    0.5.0 import

 0001-Fix-up-shiboken.pc-file-generation.patch |   28 +++++++
 shiboken.spec                                 |   94 +++++--------------------
 sources                                       |    2 +-
 3 files changed, 48 insertions(+), 76 deletions(-)
---

diff --git a/0001-Fix-up-shiboken.pc-file-generation.patch b/0001-Fix-up-shiboken.pc-file-generation.patch
new file mode 100644
index 0000000..1d742df
--- /dev/null
+++ b/0001-Fix-up-shiboken.pc-file-generation.patch
@@ -0,0 +1,28 @@
+From 07b4e71aed9a8fe2b5e4339b42b7952b7d6a5e61 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalev at smartlink.ee>
+Date: Sat, 11 Sep 2010 15:21:58 +0300
+Subject: [PATCH] Fix up shiboken.pc file generation
+
+Use @var@ syntax instead of ${var} in shiboken.pc.in; configure_file is
+called with @ONLY option in CMakeLists.txt, which means that ${var}
+doesn't get replaced.
+---
+ data/shiboken.pc.in |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/shiboken.pc.in b/data/shiboken.pc.in
+index ed1cc6c..c54e84a 100644
+--- a/data/shiboken.pc.in
++++ b/data/shiboken.pc.in
+@@ -7,6 +7,6 @@ generator_location=@CMAKE_INSTALL_PREFIX@/bin/shiboken
+ Name: shiboken
+ Description: Support library for Python bindings created with Shiboken generator.
+ Version: @shiboken_VERSION@
+-Libs: -L${libdir} -lpython -lshiboken${shiboken_SUFFIX}
+-Cflags: -I${includedir}/shiboken${shiboken_SUFFIX}
++Libs: -L${libdir} -lpython -lshiboken at shiboken_SUFFIX@
++Cflags: -I${includedir}/shiboken at shiboken_SUFFIX@
+ 
+-- 
+1.7.2.2
+
diff --git a/shiboken.spec b/shiboken.spec
index 8b84e1b..c410f16 100644
--- a/shiboken.spec
+++ b/shiboken.spec
@@ -1,12 +1,14 @@
 Name:           shiboken
-Version:        1.1.0
-Release:        3%{?dist}
+Version:        0.5.0
+Release:        2%{?dist}
 Summary:        CPython bindings generator for C++ libraries
 
 Group:          Development/Tools
 License:        GPLv2
 URL:            http://www.pyside.org
 Source0:        http://www.pyside.org/files/shiboken-%{version}.tar.bz2
+Patch0:         0001-Fix-up-shiboken.pc-file-generation.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  apiextractor-devel
 BuildRequires:  cmake
@@ -59,6 +61,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1
 
 # Build against sparsehash package
 rm -rf ext/sparsehash/
@@ -73,14 +76,13 @@ popd
 make %{?_smp_mflags} -C %{_target_platform}
 
 # Build html docs
-make %{?_smp_mflags} -C %{_target_platform} doc
-rm -f %{_target_platform}/doc/html/_static/images/._*
-rm -f %{_target_platform}/doc/html/.buildinfo
-rm -f %{_target_platform}/doc/html/objects.inv
-rm -rf %{_target_platform}/doc/html/.doctrees
+make -C doc html
+rm -f doc/_build/html/_static/images/._*
+rm -f doc/_build/html/.buildinfo
 
 
 %install
+rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 
 
@@ -88,102 +90,44 @@ make install DESTDIR=$RPM_BUILD_ROOT -C %{_target_platform}
 make test -C %{_target_platform}
 
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
 %post libs -p /sbin/ldconfig
 
 %postun libs -p /sbin/ldconfig
 
 
 %files
+%defattr(-,root,root,-)
 %doc ChangeLog COPYING
 %{_bindir}/shiboken
 %{_libdir}/generatorrunner/*
-%{_mandir}/man1/shiboken.1*
 
 %files libs
+%defattr(-,root,root,-)
 %doc COPYING.libshiboken
-%{_libdir}/libshiboken*.so.*
+%{_libdir}/libshiboken.so.*
 
 %files devel
-%doc %{_target_platform}/doc/html/
+%defattr(-,root,root,-)
+%doc doc/_build/html/
 %{_includedir}/shiboken/
-%{_libdir}/libshiboken*.so
+%{_libdir}/libshiboken.so
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/cmake/Shiboken-%{version}/
 
 
 %changelog
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Fri Jul 27 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Sat Jan 21 2012 Kalev Lember <kalevlember at gmail.com> - 1.1.0-1
-- Update to 1.1.0
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.9-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Oct 26 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.9-2
-- Rebuilt for glibc bug#747377
-
-* Fri Oct 21 2011 Kalev Lember <kalevlember at gmail.com> - 1.0.9-1
-- Update to 1.0.9
-
-* Thu Aug 25 2011 Kalev Lember <kalevlember at gmail.com> - 1.0.6-1
-- Update to 1.0.6
-
-* Thu Jun 23 2011 Kalev Lember <kalev at smartlink.ee> - 1.0.4-1
-- Update to 1.0.4
-- Cleaned up the spec file for modern rpmbuild
-
-* Fri May 27 2011 Kalev Lember <kalev at smartlink.ee> - 1.0.3-1
-- Update to 1.0.3
-
-* Sun May 01 2011 Kalev Lember <kalev at smartlink.ee> - 1.0.2-1
-- Update to 1.0.2
-
-* Sun Apr 03 2011 Kalev Lember <kalev at smartlink.ee> - 1.0.1-1
-- Update to 1.0.1
-
-* Thu Mar 03 2011 Kalev Lember <kalev at smartlink.ee> - 1.0.0-1
-- Update to 1.0.0
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-0.4.beta4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Sat Jan 22 2011 Kalev Lember <kalev at smartlink.ee> - 1.0.0-0.3.beta4
-- Update to 1.0.0~beta4
-
-* Sat Nov 27 2010 Kalev Lember <kalev at smartlink.ee> - 1.0.0-0.2.beta1
-- Removed spurious objects.inv file from html docs
-
-* Fri Nov 26 2010 Kalev Lember <kalev at smartlink.ee> - 1.0.0-0.1.beta1
-- Update to 1.0.0~beta1
-
-* Thu Oct 14 2010 Kalev Lember <kalev at smartlink.ee> - 0.5.1-1
-- Update to 0.5.1
-- Dropped upstreamed pkgconfig patch
-
-* Wed Sep 29 2010 jkeating - 0.5.0-3
-- Rebuilt for gcc bug 634757
-
 * Sat Sep 11 2010 Kalev Lember <kalev at smartlink.ee> - 0.5.0-2
 - Added patch to fix pkgconfig file generation
 
 * Sat Sep 11 2010 Kalev Lember <kalev at smartlink.ee> - 0.5.0-1
 - Update to 0.5.0
-- Dropped upstreamed patches
 
 * Wed Aug 04 2010 Kalev Lember <kalev at smartlink.ee> - 0.4.0-1
 - Update to 0.4.0
-- Backport patch to fix tests with Python 2.7
-
-* Mon Aug 02 2010 Kalev Lember <kalev at smartlink.ee> - 0.3.2-6
-- Temporarily disable tests to fix build with Python 2.7
-
-* Sat Jul 31 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 0.3.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 
 * Sat Jul 24 2010 Kalev Lember <kalev at smartlink.ee> - 0.3.2-4
 - Explicitly require generatorrunner for %%{_libdir}/generatorrunner/ directory
diff --git a/sources b/sources
index 05b8e0a..631a9c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c9d696c8c426fb5abf28a6bd3759558  shiboken-1.1.0.tar.bz2
+ca377b865b09aff2f2a035fc5eb950e8  shiboken-0.5.0.tar.bz2
