From 08b95fcc01147d346fd40efa9d8f1a3c860cc245 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Thu, 20 Sep 2007 14:52:53 +0000 Subject: [PATCH] - added changes from review request (#225241) //freshrpms.net/> 1.0.15-0.2.rc2 - Update License field. - Use configdir instead of sysconfdir hacks (cleaner). - Remove redundant optflags overriding. - Switch to using main "version", and merge "postver" since this is the right way of doing things (see NamingGuidelines#NonNumericRelease). - Remove static library. - Mark all of /etc/alsa as config, but not "noreplace". - Remove useless rpath on 64bit archs. --- alsa-lib.spec | 65 +++++++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/alsa-lib.spec b/alsa-lib.spec index 9e0a50c..6e51835 100644 --- a/alsa-lib.spec +++ b/alsa-lib.spec @@ -1,20 +1,19 @@ -%define version_main 1.0.15 %define prever rc2 %define prever_dot .rc2 Summary: The Advanced Linux Sound Architecture (ALSA) library. Name: alsa-lib -Version: %{version_main} -Release: 0.1%{?prever_dot}%{?dist} -License: LGPL +Version: 1.0.15 +Release: 0.2%{?prever_dot}%{?dist} +License: LGPLv2+ Group: System Environment/Libraries -Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}%{?postver}.tar.bz2 -Patch0: alsa-lib-1.0.14rc1-config.patch -Patch2: alsa-lib-1.0.14-glibc-open.patch +Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2 +Patch0: alsa-lib-1.0.14rc1-config.patch +Patch2: alsa-lib-1.0.14-glibc-open.patch URL: http://www.alsa-project.org/ -BuildRoot: %{_tmppath}/%{name}-%{version_main}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: doxygen -Prereq: /sbin/ldconfig, coreutils +Requires(post): /sbin/ldconfig, coreutils %description The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI @@ -25,10 +24,11 @@ programming and provide higher level functionality as well as support for the older OSS API, providing binary compatibility for most OSS programs. %package devel -Summary: Static libraries and header files from the ALSA library. +Summary: Development files from the ALSA library Group: Development/Libraries -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires: pkgconfig + %description devel The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI functionality to the Linux operating system. @@ -37,15 +37,15 @@ This package includes the ALSA development libraries for developing against the ALSA libraries and interfaces. %prep -%setup -q -n %{name}-%{version_main}%{?prever}%{?postver} +%setup -q -n %{name}-%{version}%{?prever} %patch0 -p1 -b .config %patch2 -p1 -b .glibc-open %build -%configure \ - CFLAGS="$RPM_OPT_FLAGS"\ - --enable-static=yes \ - --datadir=/etc +%configure --with-configdir=%{_sysconfdir}/alsa +# Remove useless /usr/lib64 rpath on 64bit archs +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 make %{?_smp_mflags} make doc @@ -53,14 +53,11 @@ make doc rm -rf %{buildroot} make DESTDIR=%{buildroot} install -mkdir -p %{buildroot}%{_datadir} +# We need the library to be available even before /usr might be mounted mkdir -p %{buildroot}/%{_lib} - mv %{buildroot}%{_libdir}/libasound.so.* %{buildroot}/%{_lib} ln -snf ../../%{_lib}/libasound.so.2 %{buildroot}%{_libdir}/libasound.so -mv %{buildroot}/etc/aclocal %{buildroot}%{_datadir} - %clean rm -rf %{buildroot} @@ -72,28 +69,34 @@ rm -rf %{buildroot} ln -snf ../../etc/alsa %{_datadir}/alsa %files -%defattr(-, root, root) +%defattr(-,root,root,-) %doc COPYING ChangeLog TODO doc/asoundrc.txt -%{_bindir}/aserver +%config %{_sysconfdir}/alsa/ /%{_lib}/libasound.so.* -%{_libdir}/alsa-lib/smixer/* -%{_sysconfdir}/alsa -%config %{_sysconfdir}/alsa/alsa.conf -%dir %{_libdir}/alsa-lib -%dir %{_libdir}/alsa-lib/smixer +%{_bindir}/aserver +%{_libdir}/alsa-lib/ %files devel -%defattr(-, root, root) -%doc doc/doxygen -%{_includedir}/alsa +%defattr(-,root,root,-) +%doc doc/doxygen/ +%{_includedir}/alsa/ %{_includedir}/sys/asoundlib.h %{_libdir}/libasound.so -%{_libdir}/libasound.a %exclude %{_libdir}/libasound.la %{_libdir}/pkgconfig/alsa.pc %{_datadir}/aclocal/alsa.m4 %changelog +* Thu Sep 20 2007 Matthias Saou 1.0.15-0.2.rc2 +- Update License field. +- Use configdir instead of sysconfdir hacks (cleaner). +- Remove redundant optflags overriding. +- Switch to using main "version", and merge "postver" since this is the right + way of doing things (see NamingGuidelines#NonNumericRelease). +- Remove static library. +- Mark all of /etc/alsa as config, but not "noreplace". +- Remove useless rpath on 64bit archs. + * Wed Sep 19 2007 Martin Stransky 1.0.15-0.1.rc2 - updated to 1.0.15rc2