- 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.
This commit is contained in:
parent
a2f2733e39
commit
08b95fcc01
@ -1,20 +1,19 @@
|
|||||||
%define version_main 1.0.15
|
|
||||||
%define prever rc2
|
%define prever rc2
|
||||||
%define prever_dot .rc2
|
%define prever_dot .rc2
|
||||||
|
|
||||||
Summary: The Advanced Linux Sound Architecture (ALSA) library.
|
Summary: The Advanced Linux Sound Architecture (ALSA) library.
|
||||||
Name: alsa-lib
|
Name: alsa-lib
|
||||||
Version: %{version_main}
|
Version: 1.0.15
|
||||||
Release: 0.1%{?prever_dot}%{?dist}
|
Release: 0.2%{?prever_dot}%{?dist}
|
||||||
License: LGPL
|
License: LGPLv2+
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version_main}%{?prever}%{?postver}.tar.bz2
|
Source: ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
|
||||||
Patch0: alsa-lib-1.0.14rc1-config.patch
|
Patch0: alsa-lib-1.0.14rc1-config.patch
|
||||||
Patch2: alsa-lib-1.0.14-glibc-open.patch
|
Patch2: alsa-lib-1.0.14-glibc-open.patch
|
||||||
URL: http://www.alsa-project.org/
|
URL: http://www.alsa-project.org/
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version_main}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
Prereq: /sbin/ldconfig, coreutils
|
Requires(post): /sbin/ldconfig, coreutils
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
|
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.
|
the older OSS API, providing binary compatibility for most OSS programs.
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Static libraries and header files from the ALSA library.
|
Summary: Development files from the ALSA library
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
Requires: %{name} = %{version}
|
Requires: %{name} = %{version}-%{release}
|
||||||
Requires: pkgconfig
|
Requires: pkgconfig
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
|
The Advanced Linux Sound Architecture (ALSA) provides audio and MIDI
|
||||||
functionality to the Linux operating system.
|
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.
|
against the ALSA libraries and interfaces.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version_main}%{?prever}%{?postver}
|
%setup -q -n %{name}-%{version}%{?prever}
|
||||||
%patch0 -p1 -b .config
|
%patch0 -p1 -b .config
|
||||||
%patch2 -p1 -b .glibc-open
|
%patch2 -p1 -b .glibc-open
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure \
|
%configure --with-configdir=%{_sysconfdir}/alsa
|
||||||
CFLAGS="$RPM_OPT_FLAGS"\
|
# Remove useless /usr/lib64 rpath on 64bit archs
|
||||||
--enable-static=yes \
|
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
||||||
--datadir=/etc
|
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
make doc
|
make doc
|
||||||
|
|
||||||
@ -53,14 +53,11 @@ make doc
|
|||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
make DESTDIR=%{buildroot} install
|
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}
|
mkdir -p %{buildroot}/%{_lib}
|
||||||
|
|
||||||
mv %{buildroot}%{_libdir}/libasound.so.* %{buildroot}/%{_lib}
|
mv %{buildroot}%{_libdir}/libasound.so.* %{buildroot}/%{_lib}
|
||||||
ln -snf ../../%{_lib}/libasound.so.2 %{buildroot}%{_libdir}/libasound.so
|
ln -snf ../../%{_lib}/libasound.so.2 %{buildroot}%{_libdir}/libasound.so
|
||||||
|
|
||||||
mv %{buildroot}/etc/aclocal %{buildroot}%{_datadir}
|
|
||||||
|
|
||||||
%clean
|
%clean
|
||||||
rm -rf %{buildroot}
|
rm -rf %{buildroot}
|
||||||
|
|
||||||
@ -72,28 +69,34 @@ rm -rf %{buildroot}
|
|||||||
ln -snf ../../etc/alsa %{_datadir}/alsa
|
ln -snf ../../etc/alsa %{_datadir}/alsa
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-, root, root)
|
%defattr(-,root,root,-)
|
||||||
%doc COPYING ChangeLog TODO doc/asoundrc.txt
|
%doc COPYING ChangeLog TODO doc/asoundrc.txt
|
||||||
%{_bindir}/aserver
|
%config %{_sysconfdir}/alsa/
|
||||||
/%{_lib}/libasound.so.*
|
/%{_lib}/libasound.so.*
|
||||||
%{_libdir}/alsa-lib/smixer/*
|
%{_bindir}/aserver
|
||||||
%{_sysconfdir}/alsa
|
%{_libdir}/alsa-lib/
|
||||||
%config %{_sysconfdir}/alsa/alsa.conf
|
|
||||||
%dir %{_libdir}/alsa-lib
|
|
||||||
%dir %{_libdir}/alsa-lib/smixer
|
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%defattr(-, root, root)
|
%defattr(-,root,root,-)
|
||||||
%doc doc/doxygen
|
%doc doc/doxygen/
|
||||||
%{_includedir}/alsa
|
%{_includedir}/alsa/
|
||||||
%{_includedir}/sys/asoundlib.h
|
%{_includedir}/sys/asoundlib.h
|
||||||
%{_libdir}/libasound.so
|
%{_libdir}/libasound.so
|
||||||
%{_libdir}/libasound.a
|
|
||||||
%exclude %{_libdir}/libasound.la
|
%exclude %{_libdir}/libasound.la
|
||||||
%{_libdir}/pkgconfig/alsa.pc
|
%{_libdir}/pkgconfig/alsa.pc
|
||||||
%{_datadir}/aclocal/alsa.m4
|
%{_datadir}/aclocal/alsa.m4
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Sep 20 2007 Matthias Saou <http://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.
|
||||||
|
|
||||||
* Wed Sep 19 2007 Martin Stransky <stransky@redhat.com> 1.0.15-0.1.rc2
|
* Wed Sep 19 2007 Martin Stransky <stransky@redhat.com> 1.0.15-0.1.rc2
|
||||||
- updated to 1.0.15rc2
|
- updated to 1.0.15rc2
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user