[libcdio/f18] Revert "added patches from Christophe Fergeau which add"

Adrian Reber adrian at fedoraproject.org
Fri Jan 25 14:24:35 UTC 2013


commit 39304c1402ee67b18c42c22e8b55a9280fd376d6
Author: Adrian Reber <adrian at lisas.de>
Date:   Fri Jan 25 15:24:20 2013 +0100

    Revert "added patches from Christophe Fergeau which add"
    
    This reverts commit 19ba0c77fd9377af85b714a228f15645e4126a93.

 libcdio-0.83-udf-fixes.patch                       |   14 -
 ...-add-udf-support-to-iso-read-and-iso-info.patch |  660 --------------------
 libcdio.spec                                       |   16 +-
 3 files changed, 1 insertions(+), 689 deletions(-)
---
diff --git a/libcdio.spec b/libcdio.spec
index 58f4896..0704a6c 100644
--- a/libcdio.spec
+++ b/libcdio.spec
@@ -1,6 +1,6 @@
 Name: libcdio
 Version: 0.83
-Release: 6%{?dist}
+Release: 5%{?dist}
 Summary: CD-ROM input and control library
 Group: System Environment/Libraries
 License: GPLv3+
@@ -10,9 +10,6 @@ Source1: http://ftp.gnu.org/gnu/libcdio/libcdio-0.83.tar.bz2.sig
 Source2: libcdio-no_date_footer.hml
 Source3: cdio_config.h
 Patch0: libcdio-fix-for-more-than-99-tracks.diff
-#Patch1 and Patch2 are backports of upstream patches present in the 0.90 release
-Patch1: libcdio-0.83-udf-fixes.patch
-Patch2: libcdio-add-udf-support-to-iso-read-and-iso-info.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: pkgconfig doxygen
 BuildRequires: ncurses-devel
@@ -22,9 +19,6 @@ Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 BuildRequires: gettext-devel
 BuildRequires: chrpath
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
 
 
 %description
@@ -44,10 +38,6 @@ This package contains header files and libraries for %{name}.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-#needed by Patch2
-autoreconf -fi
 
 f=src/cd-paranoia/doc/ja/cd-paranoia.1.in
 iconv -f euc-jp -t utf-8 -o $f.utf8 $f && mv $f.utf8 $f
@@ -155,10 +145,6 @@ fi
 
 
 %changelog
-* Fri Jan 25 2013 Adrian Reber <adrian at lisas.de> - 0.83-6
-- added patches from Christophe Fergeau which add
-  UDF support to iso-read/iso-info
-
 * Tue Jul 24 2012 Adrian Reber <adrian at lisas.de> - 0.83-5
 - fixed #477288 (libcdio-devel multilib conflict) again
 


More information about the scm-commits mailing list