Browse Source

cdparanoia-10.2-4

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11507 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 6 years ago
parent
commit
45ced07574
1 changed files with 21 additions and 31 deletions
  1. 21 31
      c/cdparanoia/cdparanoia-vl.spec

+ 21 - 31
c/cdparanoia/cdparanoia-vl.spec

@@ -4,19 +4,21 @@ Name: cdparanoia
 Summary: A Compact Disc Digital Audio (CDDA) extraction tool (or ripper).
 Summary(ja): 音楽 CD (CDDA) 用の抽出ツール
 Version: 10.2
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
 
 Group: Applications/Multimedia
 License: GPLv2 and LGPLv2
 URL: http://www.xiph.org/paranoia/index.html
 
 Source: http://www.xiph.org/paranoia/download/%{name}-III-%{version}.src.tgz 
-Patch0: cdparanoia-fPIC.patch
 # Patch from upstream to fix cdda_interface.h C++ incompatibility ("private")
 # https://trac.xiph.org/changeset/15338
 # https://bugzilla.redhat.com/show_bug.cgi?id=463009
-Patch1: cdparanoia-10.2-#463009.patch
-#Patch1: cdparanoia-gcc4-build.patch
+Patch0: cdparanoia-10.2-#463009.patch
+# #466659
+Patch1: cdparanoia-10.2-endian.patch
+Patch2: cdparanoia-10.2-install.patch
+Patch3: cdparanoia-10.2-format-security.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
@@ -72,38 +74,23 @@ files needed for developing applications to read CD Digital Audio disks.
 
 %prep
 %setup -q -n %{name}-III-%{version}
-%patch1 -p3 -b .#463009
+%patch0 -p3 -b .#463009
+%patch1 -p1 -b .endian
+%patch2 -p1 -b .install
+%patch3 -p1 -b .fmt-sec
 
 %build
-export OPT="${CFLAGS:-%optflags} -O0 -Wno-pointer-sign -Wno-unused -Werror-implicit-function-declaration"
 %configure --includedir=%{_includedir}/cdda
-make OPT="$OPT"
+# Using -O0 is mandatory, the build fails otherwise...
+# Also remove many warnings which we are aware of
+# Lastly, don't use _smp_mflags since it also makes the build fail
+make OPT="$RPM_OPT_FLAGS -O0 -Wno-pointer-sign -Wno-unused"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_includedir}/cdda
-install -d $RPM_BUILD_ROOT%{_libdir}
-install -d $RPM_BUILD_ROOT%{_mandir}/man1
-install -m 0755 cdparanoia $RPM_BUILD_ROOT%{_bindir}
-install -m 0644 cdparanoia.1 $RPM_BUILD_ROOT%{_mandir}/man1/ 
-install -m 0644 utils.h paranoia/cdda_paranoia.h interface/cdda_interface.h \
-	$RPM_BUILD_ROOT%{_includedir}/cdda
-install -m 0755 paranoia/libcdda_paranoia.so.0.10.? \
-	interface/libcdda_interface.so.0.10.? \
-	$RPM_BUILD_ROOT%{_libdir}
-install -m 0755 paranoia/libcdda_paranoia.a interface/libcdda_interface.a \
-	$RPM_BUILD_ROOT%{_libdir}
-install -d $RPM_BUILD_ROOT%{_mandir}/ja/man1
-install -m 0644 cdparanoia.1.jp $RPM_BUILD_ROOT%{_mandir}/ja/man1/cdparanoia.1
-
-/sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir}
-
-pushd $RPM_BUILD_ROOT%{_libdir}
-ln -s libcdda_paranoia.so.0.10.? libcdda_paranoia.so
-ln -s libcdda_interface.so.0.10.? libcdda_interface.so
-popd
+make install DESTDIR=$RPM_BUILD_ROOT
+mkdir -p %{buildroot}%{_mandir}/ja/man1
+install -m644 cdparanoia.1.jp %{buildroot}%{_mandir}/ja/man1/cdparanoia.1
 
 %post -p /sbin/ldconfig
 
@@ -142,6 +129,9 @@ popd
 %endif
 
 %changelog
+* Thu Feb 22 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 10.2-4
+- imported Patch1-3 from rawhide.
+
 * Wed Jan 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 10.2-3
 - create compat32 sub packages
 
@@ -188,7 +178,7 @@ popd
 * Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
 - automatic rebuild
 
-* Wed Jun 06 2000 Preston Brown <pbrown@redhat.com>
+* Tue Jun 06 2000 Preston Brown <pbrown@redhat.com>
 - revert name change
 - use new rpm macro paths