rpms/normalize/devel normalize-0.7.7-audiofile.patch, NONE, 1.1 normalize-0.7.7-autoreconf.patch, NONE, 1.1 normalize.spec, 1.8, 1.9

Mon Mar 25 23:25:05 CET 2013

Author: jwrdegoede

Update of /cvs/free/rpms/normalize/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5617

Modified Files:
	normalize.spec 
Added Files:
	normalize-0.7.7-audiofile.patch 
	normalize-0.7.7-autoreconf.patch 
Log Message:
* Mon Mar 25 2013 Hans de Goede <j.w.r.degoede at gmail.com> - 0.7.7-9
- Fix FTBFS
- Modernize spec a bit
- Fix various rpmlint warnings


normalize-0.7.7-audiofile.patch:
 configure.ac |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE normalize-0.7.7-audiofile.patch ---
diff -up normalize-0.7.7/configure.ac.audiofile normalize-0.7.7/configure.ac
--- normalize-0.7.7/configure.ac.audiofile	2005-09-14 09:23:16.000000000 +0200
+++ normalize-0.7.7/configure.ac	2013-03-25 22:52:11.908477894 +0100
@@ -249,8 +249,8 @@ AC_SUBST(PLUGINS)
 
 dnl *** Stuff for audiofile library ***
 dnl v0.2.1 and before have bugs with 24-bit LE files
-AM_PATH_AUDIOFILE([ 0.2.2 ], [ have_audiofile=true ])
-dnl AC_CHECK_LIB(audiofile, afSetVirtualSampleFormat, have_audiofile=true)
+#AM_PATH_AUDIOFILE([ 0.2.2 ], [ have_audiofile=true ])
+AC_CHECK_LIB(audiofile, afSetVirtualSampleFormat, have_audiofile=true)
 AH_TEMPLATE([USE_AUDIOFILE],
 	    [Define if you want to use the audiofile library.])
 AC_ARG_WITH(audiofile,
@@ -266,7 +266,8 @@ if test x$with_audiofile != xfalse; then
     if test x$have_audiofile = xtrue; then
 	AC_DEFINE(USE_AUDIOFILE)
 	use_audiofile=true
-dnl	AUDIOFILELIBS="-laudiofile"
+	AUDIOFILE_LIBS="-laudiofile"
+	AUDIOFILE_CFLAGS=
     elif test x$with_audiofile = xtrue; then
 	AC_MSG_ERROR([--with-audiofile specified, but audiofile library not found])
     fi
@@ -275,7 +276,8 @@ dnl AC_SUBST(AUDIOFILELIBS)
 test x$use_audiofile = xfalse && AUDIOFILE_LIBS=
 test x$use_audiofile = xfalse && AUDIOFILE_CFLAGS=
 AM_CONDITIONAL(AUDIOFILE, test x$use_audiofile = xtrue)
-
+AC_SUBST(AUDIOFILE_LIBS)
+AC_SUBST(AUDIOFILE_CFLAGS)
 
 dnl *** Stuff for mad mpeg audio decoder library ***
 AH_TEMPLATE([USE_MAD],

normalize-0.7.7-autoreconf.patch:
 Makefile.am |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE normalize-0.7.7-autoreconf.patch ---
diff -up normalize-0.7.7/src/Makefile.am~ normalize-0.7.7/src/Makefile.am
--- normalize-0.7.7/src/Makefile.am~	2005-09-12 07:31:15.000000000 +0200
+++ normalize-0.7.7/src/Makefile.am	2013-03-25 23:02:32.832497764 +0100
@@ -55,10 +55,10 @@ CLEANFILES = mktestwav riffwalk wavread
 
 install-exec-hook:
 	(cd $(DESTDIR)$(bindir); \
-	$(LN_S) `echo normalize-mp3 | sed @program_transform_name@` \
-	        `echo normalize-ogg | sed @program_transform_name@`; \
-	mv -f `echo normalize | sed @program_transform_name@` \
-	      `echo @NORMALIZE_BIN@ | sed @program_transform_name@`; \
+	$(LN_S) `echo normalize-mp3 | sed '@program_transform_name@'` \
+	        `echo normalize-ogg | sed '@program_transform_name@'`; \
+	mv -f `echo normalize | sed '@program_transform_name@'` \
+	      `echo @NORMALIZE_BIN@ | sed '@program_transform_name@'`; \
 	exit 0)
 
 # test program targets follow


Index: normalize.spec
===================================================================
RCS file: /cvs/free/rpms/normalize/devel/normalize.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- normalize.spec	3 Mar 2013 21:45:12 -0000	1.8
+++ normalize.spec	25 Mar 2013 22:25:04 -0000	1.9
@@ -3,21 +3,20 @@
 Summary:  Tool for adjusting the volume of audio files to a standard level
 Name:     normalize
 Version:  0.7.7
-Release:  8%{?dist}
+Release:  9%{?dist}
 URL:      http://normalize.nongnu.org/
 License:  GPLv2+
 Group:    Applications/Multimedia
 Source:   http://savannah.nongnu.org/download/normalize/normalize-0.7.7.tar.bz2
-BuildRoot:  %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-BuildRequires:  audiofile-devel >= 1:0.2.1-2, libmad-devel
-BuildRequires:  gettext
+Patch0:   normalize-0.7.7-audiofile.patch
+Patch1:   normalize-0.7.7-autoreconf.patch
+BuildRequires:  audiofile-devel >= 1:0.2.1-2 libmad-devel gettext
+# For autoreconf
+BuildRequires:  libtool perl-Carp
 # Binaries from the following are required. 
-BuildRequires:  lame, vorbis-tools
+BuildRequires:  lame vorbis-tools madplay flac
 # Explicit, because won't be detected automatically.
-Requires:  lame, vorbis-tools
-%ifarch x86_64
-BuildRequires:  libtool 
-%endif
+Requires:       lame vorbis-tools madplay flac
 
 %description
 normalize is a tool for adjusting the volume of audio files to a
@@ -25,11 +24,12 @@
 and mp3 collections, where different recording levels on different
 albums can cause the volume to vary greatly from song to song.
 
+
 %package -n xmms-%{name}
 Summary:  Relative volume adjustment plugin for XMMS
 Group:    Applications/Multimedia
 BuildRequires:  xmms-devel, gtk+-devel
-Requires:  xmms-libs, %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description -n xmms-%{name}
 Plugin for XMMS to honour relative volume adjustment (RVA2) ID3 tag frames.
@@ -37,30 +37,29 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+touch AUTHORS ChangeLog
+autoreconf -i -f
+for i in THANKS doc/normalize-mp3.1; do
+    iconv -f ISO-8859-1 -t UTF8 "$i" > "$i.UTF8"
+    touch -r "$i" "$i.UTF8"
+    mv "$i.UTF8" "$i"
+done
 
 
 %build
-%configure --enable-xmms --with-mad --with-audiofile
-make  \
-%ifarch x86_64
-  LIBTOOL=/usr/bin/libtool \
-%endif
-  %{?_smp_mflags}
+%configure --enable-xmms --with-mad --with-audiofile --disable-static
+make %{?_smp_mflags}
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+rm $RPM_BUILD_ROOT%{_libdir}/xmms/Effect/librva.la
 %find_lang %{name}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %files -f %{name}.lang
-%defattr(-,root,root)
 %doc COPYING README NEWS THANKS TODO
 %{_bindir}/normalize
 %{_bindir}/normalize-mp3
@@ -68,14 +67,16 @@
 %{_mandir}/man1/normalize.1.gz
 %{_mandir}/man1/normalize-mp3.1.gz
 
-
 %files -n xmms-%{name}
-%defattr(-,root,root)
 %{plugindir}/librva.so
-%exclude %{_libdir}/xmms/Effect/librva.*a
-# The * here is for x86_64 build where a librva.a and a librva.la are builded
+
 
 %changelog
+* Mon Mar 25 2013 Hans de Goede <j.w.r.degoede at gmail.com> - 0.7.7-9
+- Fix FTBFS
+- Modernize spec a bit
+- Fix various rpmlint warnings
+
 * Sun Mar 03 2013 Nicolas Chauvet <kwizart at gmail.com> - 0.7.7-8
 - Mass rebuilt for Fedora 19 Features
 
@@ -117,7 +118,7 @@
 - xmms-config errors redirected to dev/null
 
 * Sun May  4 2003 Michael Schwendt <mschwendt[AT]users.sf.net> - 0:0.7.6-0.fdr.7
-- Use $RPM_BUILD_ROOT instead of %{buildroot}.
+- Use $RPM_BUILD_ROOT instead of %%{buildroot}.
 - Fix spec file in accordance with bug #213 comments #14 and #15.
 
 * Sun Apr 27 2003 Michael Schwendt <mschwendt[AT]users.sf.net>
