[arch-commits] Commit in libcdio-paranoia/trunk (PKGBUILD header-fix.patch)

[Eric Bélanger]

    Date: Monday, April 15, 2013 @ 02:21:55
  Author: eric
Revision: 182766

upgpkg: libcdio-paranoia 10.2+0.90+1-1

Upstream update, Remove old patch, PKGBUILD clean up

Modified:
  libcdio-paranoia/trunk/PKGBUILD
Deleted:
  libcdio-paranoia/trunk/header-fix.patch

------------------+
 PKGBUILD         |   22 ++++++----------------
 header-fix.patch |   13 -------------
 2 files changed, 6 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-04-14 18:45:30 UTC (rev 182765)
+++ PKGBUILD	2013-04-15 00:21:55 UTC (rev 182766)
@@ -3,7 +3,7 @@
 # Contributor: damir <damir at archlinux.org>
 
 pkgname=libcdio-paranoia
-pkgver=10.2+0.90
+pkgver=10.2+0.90+1
 pkgrel=1
 pkgdesc="CD paranoia libraries from libcdio"
 arch=('i686' 'x86_64')
@@ -11,27 +11,17 @@
 url="http://www.gnu.org/software/libcdio/"
 depends=('libcdio')
 options=('!libtool')
-source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.bz2{,.sig}
-        header-fix.patch)
-md5sums=('432e9f1c5ceb645c4bca9db3f9297437'
-         '39766404d473ecda66c2f3a932d1c57c'
-         '1ebb33a1cfe00181de31138ef001e01b')
+source=(http://ftp.gnu.org/gnu/libcdio/${pkgname}-${pkgver}.tar.bz2{,.sig})
+md5sums=('e79e196864dd3b1ca87a01345abbda07'
+         'SKIP')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np0 -i ../header-fix.patch
-  sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
-  aclocal
-  autoconf
-  automake --add-missing
+  cd "${pkgname}-${pkgver}"
   ./configure --prefix=/usr --enable-cpp-progs --disable-static --disable-example-progs
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd "${pkgname}-${pkgver}"
   make -j1 DESTDIR="${pkgdir}" install
-  
-  #sed -i "/LIBCDIO_SOURCE_PATH/s|.*|/* #undef LIBCDIO_SOURCE_PATH */|" \
-  #  $pkgdir/usr/include/cdio/cdio_config.h
 }

Deleted: header-fix.patch
===================================================================
--- header-fix.patch	2013-04-14 18:45:30 UTC (rev 182765)
+++ header-fix.patch	2013-04-15 00:21:55 UTC (rev 182766)
@@ -1,13 +0,0 @@
---- include/cdio/paranoia/Makefile.am.orig	2013-01-08 10:40:32.237218755 +0000
-+++ include/cdio/paranoia/Makefile.am	2013-01-08 10:41:22.269997804 +0000
-@@ -3,8 +3,8 @@
- ########################################################
- #
- 
--libcdioincludedir=$(includedir)/cdio
--dist_libcdioinclude_HEADERS = cdda.h paranoia.h 
-+cdio_paranoia_includedir=$(includedir)/cdio/paranoia
-+dist_cdio_paranoia_include_HEADERS = cdda.h paranoia.h 
- 
- EXTRA_DIST = version.h.in
- BUILT_SOURCES = version.h