[syck] - Update with latest version from GIT - No longer build python package, since no longer included

Oliver Falk oliver at fedoraproject.org
Tue Apr 2 08:17:27 UTC 2013


commit 8a66626199628a51f8f2da8567b4523616987902
Author: Oliver Falk <oliver at linux-kernel.at>
Date:   Tue Apr 2 10:17:07 2013 +0200

    - Update with latest version from GIT
    - No longer build python package, since no longer included

 .gitignore              |    2 +-
 sources                 |    2 +-
 syck-0.55-libtool.patch |   57 -----------------------------------------------
 syck-nan.patch          |   22 ------------------
 syck-php54.patch        |   12 ----------
 syck.spec               |   57 +++++++---------------------------------------
 6 files changed, 11 insertions(+), 141 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index af6f96f..e37978f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-syck-0.61+svn231+patches.tar.gz
+/syck-20130402.tar.bz2
diff --git a/sources b/sources
index 3e19f72..4c4593e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-66513c7b458bdadf12c97899eb33be67  syck-0.61+svn231+patches.tar.gz
+16d9f4bc8da03de80d96c1ff5360526a  syck-20130402.tar.bz2
diff --git a/syck.spec b/syck.spec
index 7fb83b8..84588c5 100644
--- a/syck.spec
+++ b/syck.spec
@@ -1,6 +1,5 @@
 %define			php_extdir %(php-config --extension-dir || echo %{_libdir}/php)
 %{!?php_version:%define php_version %(php-config --version || echo bad)}
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 # Private libraries are not be exposed globally by RPM
 # RPM 4.8
@@ -12,25 +11,19 @@
 Name:		syck
 Summary:	YAML for C, Python, and PHP
 
-Version:	0.61
-Release:	18.1%{?dist}
+Version:	0.70
+Release:	1.20130402%{?dist}
 
 License:	BSD
 Group:		System Environment/Libraries
 URL:		http://whytheluckystiff.net/syck/
 
-Source0:	http://pyyaml.org/download/pysyck/syck-%{version}+svn231+patches.tar.gz
+Source0:	http://pyyaml.org/download/pysyck/syck-20130402.tar.bz2
 Source1:	syck.ini
 
-Patch0:		syck-0.55-libtool.patch
-Patch1:		syck-nan.patch
-# https://github.com/indeyets/syck/pull/7
-Patch2:         syck-php54.patch
-
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gawk bison flex libtool
 BuildRequires:	php-devel
-BuildRequires:	python-devel
 BuildRequires:	bison-devel
 BuildRequires:	automake
 
@@ -71,26 +64,6 @@ filtering.
 
 The %{name}-php package contains the syck php extension.
 
-%package	python
-Summary:	YAML module for python
-Group:		Development/Languages
-
-%description	python
-Syck is an extension for reading and writing YAML swiftly in popular scripting
-languages. As Syck loads the YAML, it stores the data directly in your
-language's symbol table. This means speed. This means power. This means Do not
-disturb Syck because it is so focused on the task at hand that it will slay you
-mortally if you get in its way. 
-
-From http://yaml.org:
-YAML(tm) (rhymes with "camel") is a straightforward machine parsable data
-serialization format designed for human readability and interaction with
-scripting languages such as Perl and Python. YAML is optimized for data
-serialization, configuration settings, log files, Internet messaging and
-filtering. 
-
-The %{name}-python package contains the syck php extension.
-
 %package	devel
 Summary:	Static libraries and headers for developing with Syck
 Group:		Development/Libraries
@@ -113,10 +86,7 @@ This package contains the header files and static archive for developing with
 Syck.
 
 %prep
-%setup -q -n syck-0.61+svn231+patches
-%patch0 -p1 -b .libtool
-%patch1 -p0 -b .nan
-%patch2 -p1 -b .php54
+%setup -q -n syck
 
 %build
 # Rebuild all
@@ -140,11 +110,6 @@ CFLAGS="$RPM_OPT_FLAGS -I../../lib -L../../lib/.libs" %configure --with-syck=.
 %{__make} %{?_smp_mflags}
 popd # End php extension
 
-# Python extension
-pushd python
-CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
-popd # End python extension
-
 # Don't build the ruby extension, as syck is included since ruby 1.8.0.
 # See the rubygarden: http://www.rubygarden.org/ruby?YamlInRuby
 
@@ -167,11 +132,6 @@ popd # End php extension
 
 install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/php.d/syck.ini
 
-# Python extension
-pushd python
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-popd # End python extension
-
 # Get out of extension
 popd
 
@@ -198,18 +158,19 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,0755)
 %doc README.EXT README.BYTECODE
 %{_libdir}/*.so
+%{_libdir}/*.a
 %{_includedir}/*.h
 
-%files python
-%defattr(-,root,root,0755)
-%{python_sitearch}/*
-
 %files php
 %defattr(-,root,root,0755)
 %{php_extdir}/*.so
 %config(noreplace) %{_sysconfdir}/php.d/syck.ini
 
 %changelog
+* Tue Apr 02 2013 Oliver Falk <oliver at linux-kernel.at> - 0.70-1.20130402
+- Update with latest version from GIT
+- No longer build python package, since no longer included
+
 * Mon Mar 25 2013 Oliver Falk <oliver at linux-kernel.at> - 0.61-18.1
 - Rebuild for new PHP
 


More information about the scm-commits mailing list