Author: xavierb Update of /cvs/free/rpms/libaacs/F-20 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv30109 Modified Files: .cvsignore libaacs.spec sources Log Message: merge with devel Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/libaacs/F-20/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 19 Dec 2013 17:57:33 -0000 1.8 +++ .cvsignore 6 Jun 2014 21:28:07 -0000 1.9 @@ -1 +1 @@ -libaacs-0.7.0.tar.bz2 +libaacs-0.7.1.tar.bz2 Index: libaacs.spec =================================================================== RCS file: /cvs/free/rpms/libaacs/F-20/libaacs.spec,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- libaacs.spec 22 Dec 2013 11:54:55 -0000 1.11 +++ libaacs.spec 6 Jun 2014 21:28:07 -0000 1.12 @@ -1,20 +1,16 @@ -%global snapshot 0 +#global snapshot 1 %global tarball_date 20111105 %global git_hash 876f45a3f727eb6f06cdb2b0128f857226346e59 %global git_short %(echo '%{git_hash}' | cut -c -13) Name: libaacs -Version: 0.7.0 -%if %{snapshot} -Release: 0.4.%{tarball_date}git%{git_short}%{?dist} -%else -Release: 2%{?dist} -%endif +Version: 0.7.1 +Release: 1%{?snapshot:.%{tarball_date}git%{git_short}}%{?dist} Summary: Open implementation of AACS specification Group: System Environment/Libraries License: LGPLv2+ URL: http://www.videolan.org/developers/libaacs.html -%if %{snapshot} +%if 0%{?snapshot} # Use the commands below to generate a tarball. # git clone git://git.videolan.org/libaacs.git # cd libaacs @@ -23,9 +19,8 @@ %else Source0: ftp://ftp.videolan.org/pub/videolan/%{name}/%{version}/%{name}-%{version}... %endif -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -%if %{snapshot} +%if 0%{?snapshot} BuildRequires: autoconf BuildRequires: automake BuildRequires: libtool @@ -60,7 +55,7 @@ %prep -%if %{snapshot} +%if 0%{?snapshot} %setup -q -n %{name} %else %setup -q @@ -69,7 +64,7 @@ %build -%if %{snapshot} +%if 0%{?snapshot} autoreconf -vif %endif %configure --disable-static @@ -79,37 +74,40 @@ %install -rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' -%clean -rm -rf $RPM_BUILD_ROOT - - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -%defattr(-,root,root,-) %doc COPYING KEYDB.cfg ChangeLog README.txt %{_libdir}/*.so.* %files utils -%defattr(-,root,root,-) %{_bindir}/aacs_info %files devel -%defattr(-,root,root,-) %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/libaacs.pc %changelog +* Wed Jun 04 2014 Xavier Bachelot <xavier(a)bachelot.org&gt; 0.7.1-1 +- Update to 0.7.1. + +* Sat Apr 26 2014 Xavier Bachelot <xavier(a)bachelot.org&gt; 0.7.0-4 +- Add patch for libgcrypt 1.6 support. +- Tweak the Release: tag to accomodate rpmdev-bumpspec. +- Modernize specfile. + +* Sat Apr 26 2014 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 0.7.0-3 +- Rebuilt for libgcrypt + * Thu Dec 19 2013 Xavier Bachelot <xavier(a)bachelot.org&gt; 0.7.0-2 - Move test utilities to their own subpackage to avoid potential multilib conflict. Index: sources =================================================================== RCS file: /cvs/free/rpms/libaacs/F-20/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 19 Dec 2013 17:57:33 -0000 1.8 +++ sources 6 Jun 2014 21:28:07 -0000 1.9 @@ -1 +1 @@ -8da0da893d1f266b31bf8a8fc7c84a84 libaacs-0.7.0.tar.bz2 +3f475fa71352b454a62bcde860e8681c libaacs-0.7.1.tar.bz2