libdca merger done

[Hans de Goede]

Hi All,

I've created a merged package of libdca, I've started out with the livna one as 
Dominik has indicated that he wants to keep maintaining this in rpmfusion and 
that he prefers his package being used as base, the merged version is available 
here:
http://people.atrpms.net/~hdegoede/libdca.spec
http://people.atrpms.net/~hdegoede/libdca-0.0.5-2.fc8.src.rpm

Dominik, let me know if you agree with the changes, then I'll import and build 
this for livna devel, notice that once built all using packages must be rebuilt 
and may need patching before building as the lib name has changed from 
libdts.so to libdca.so. Freshrpms should have all the necessary patches ready 
for you to copy.

I've attached a diff with the current livna devel version. Note compared to the 
current freshrpms version there are no changes other then using RPM_OPT_FLAGS 
and a patch for strictaliasing.

Regards,

Hans
-------------- next part --------------
Index: libdca.spec
===================================================================
--- libdca.spec	(revision 11361)
+++ libdca.spec	(working copy)
@@ -2,20 +2,15 @@
 
 Summary: DTS Coherent Acoustics decoder library
 Name: libdca
-Version: 0.0.2
-Release: 3%{?dist}
-URL: http://developers.videolan.org/libdca.html
+Version: 0.0.5
+Release: 2%{?dist}
+URL: http://www.videolan.org/developers/libdca.html
 Group: System Environment/Libraries
-Source: http://download.videolan.org/pub/videolan/libdca/0.0.2/%{name}-%{version}.tar.gz
-Patch0: %{name}-x86_64.patch
-# Patches from gentoo
-Patch10: http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/libdts/files/libdts-0.0.2-libtool.patch
-Patch11: http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/libdts/files/libdts-0.0.2-strict-aliasing.patch
-Patch12: http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/media-libs/libdts/files/libdts-0.0.2-visibility.patch
-License: GPL
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: automake
-BuildRequires: libtool
+Source: http://download.videolan.org/pub/videolan/libdca/0.0.5/%{name}-%{version}.tar.bz2
+Patch0: libdca-0.0.5-relsymlinks.patch
+Patch1: libdca-0.0.5-strict-aliasing.patch
+License: GPLv2+
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 libdca is a free library for decoding DTS Coherent Acoustics streams. It is
@@ -45,26 +40,23 @@
 Various tools that use %{name}.
 
 %prep
-%setup -q -n libdts-%{version}
-%patch0 -p1 -b .x86_64
-%patch10 -p1 -b .libtool
-%patch11 -p1 -b .aliasing
-%patch12 -p1 -b .visibility
+%setup -q
+%patch0 -p1 -b .relsymlinks
+%patch1 -p1 -b .aliasing
+iconv -f ISO8859-1 -t UTF-8 AUTHORS > tmp; mv tmp AUTHORS
 
 %build
-#autoreconf -f -i -I m4 fails here
-%{__libtoolize} --force
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake} -a -f
 %configure --disable-static
-%{__make} %{?_smp_mflags} OPT_CFLAGS="$RPM_OPT_FLAGS"
+# Get rid of the /usr/lib64 RPATH on 64bit (as of 0.0.5)
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+# Force PIC as applications fail to recompile against the lib on x86_64 without
+%{__make} %{?_smp_mflags} OPT_CFLAGS="$RPM_OPT_FLAGS -fPIC"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-rm $RPM_BUILD_ROOT%{_libdir}/libdts.la
+rm $RPM_BUILD_ROOT%{_libdir}/%{name}.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -74,23 +66,35 @@
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%{_libdir}/*.so.*
+%{_libdir}/%{name}.so.*
 
 %files tools
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %{_bindir}/*
 %{_mandir}/man1/*
 
 %files devel
-%defattr(0644,root,root,0755)
-%doc TODO doc/libdts.txt
-%{_libdir}/pkgconfig/libdts.pc
-%{_includedir}/*
-%{_libdir}/*.so
+%defattr(-,root,root,-)
+%doc TODO doc/%{name}.txt
+%{_libdir}/pkgconfig/libd??.pc
+%{_includedir}/d??.h
+%{_libdir}/%{name}.so
 
 %changelog
+* Fri Nov  2 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 0.0.5-2
+- Merge freshrpms spec into livna spec for rpmfusion:
+- Update to latest upstream releae 0.0.5 as used by freshrpms
+- Set release to 2 to be higher as both livna and freshrpms latest release
+- Drop x86_64 patch (not needed since we override OPT_CFLAGS anyways)
+- Drop visibility patch, this should be done upstream
+- Drop upstream integrated libtool patch
+- No longer regenerate the autoxxx scripts as this is no longer needed
+- Port strict aliasing patch to 0.0.5 release
+- Add relative symlink creation patch from freshrpms
+- Update license tag in accordance with new license tag guidelines
+
 * Sat Nov 25 2006 Dominik Mierzejewski <rpm at greysector.net> 0.0.2-3
 - added patches from gentoo (shared build, strict aliasing and visibility)