[libyaml/el5] Revert "Merge branch 'el5'"

John Eckersberg jeckersb at fedoraproject.org
Wed Jan 29 18:44:40 UTC 2014


commit 0844b70c99da6b5e6c1bd4b04700ea24cc3c2335
Author: John Eckersberg <jeckersb at redhat.com>
Date:   Wed Jan 29 13:32:07 2014 -0500

    Revert "Merge branch 'el5'"
    
    This reverts commit b13abed7270b74745b01fa247eae4887e62e064e, reversing
    changes made to 0b4f78c3142809339e22e2af0b43f582bbd81289.

 .gitignore   |    2 +-
 libyaml.spec |   54 +++++++++++++++---------------------------------------
 sources      |    2 +-
 3 files changed, 17 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0035f43..57e9374 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-yaml-0.1.3.tar.gz
+yaml-0.1.2.tar.gz
diff --git a/libyaml.spec b/libyaml.spec
index 9bcc6cf..0b15c8a 100644
--- a/libyaml.spec
+++ b/libyaml.spec
@@ -1,17 +1,13 @@
-%define tarballname yaml
+Name:           libyaml
+Version:        0.1.2
+Release:        3%{?dist}
+Summary:        YAML 1.1 parser and emitter written in C
 
-#====================================================================#
-
-Name:       libyaml
-Version:    0.1.3
-Release:    3%{?dist}
-Summary:    YAML 1.1 parser and emitter written in C
-
-Group:      System Environment/Libraries
-License:    MIT
-URL:        http://pyyaml.org/
-Source0:    http://pyyaml.org/download/libyaml/%{tarballname}-%{version}.tar.gz
-BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Group:          Development/Libraries
+License:        MIT
+URL:            http://pyyaml.org/
+Source0:        http://pyyaml.org/download/libyaml/yaml-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
 %description
@@ -21,18 +17,17 @@ emitter written in C.
 
 
 %package devel
-Summary:   Development files for LibYAML applications
-Group:     Development/Libraries
-Requires:  libyaml = %{version}-%{release}
+Summary:        Development libraries and headers for developing LibYAML applications
+Group:          Development/Libraries
+Requires:       libyaml = %{version}-%{release}
 
 
 %description devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use LibYAML.
+Development libraries and headers for developing LibYAML applications.
 
 
 %prep
-%setup -q -n %{tarballname}-%{version}
+%setup -q -n yaml-%{version}
 
 
 %build
@@ -45,11 +40,6 @@ rm -rf %{buildroot}
 make DESTDIR=%{buildroot} INSTALL="install -p" install
 rm -f %{buildroot}%{_libdir}/*.{la,a}
 
-
-%check
-make check
-
-
 %clean
 rm -rf %{buildroot}
 
@@ -62,7 +52,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE README
+%doc README LICENSE
 %{_libdir}/%{name}*.so.*
 
 
@@ -74,20 +64,6 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.3-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Fri Oct 02 2009 John Eckersberg <jeckersb at redhat.com> - 0.1.3-1
-- New upstream release 0.1.3
-
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Jul 22 2009 John Eckersberg <jeckersb at redhat.com> - 0.1.2-4
-- Minor tweaks to spec file
-- Enable %%check section
-- Thanks Gareth Armstrong <gareth.armstrong at hp.com>
-
 * Tue Mar 3 2009 John Eckersberg <jeckersb at redhat.com> - 0.1.2-3
 - Remove static libraries
 
diff --git a/sources b/sources
index 04e1cdb..f969dc6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b8ab9064e8e0330423fe640de76608cd  yaml-0.1.3.tar.gz
+f6c9b5c2b0f6919abd79f5fd059b01dc  yaml-0.1.2.tar.gz


More information about the scm-commits mailing list