Update to 2.1.0.

- Drop upstreamed & old patches, README.Fedora file.
12 years ago · 1c84d6d40d
parent 30b2de48ce
commit 1c84d6d40d
6 changed files with 14 additions and 64 deletions
--- a/.gitignore
+++ b/.gitignore
@ -3,3 +3,4 @@ libffado-2.0.1-svn1864.tar.bz2
 /libffado-2.1.0-svn1983.tar.bz2
 /libffado-2.1.0-svn2000.tar.bz2
 /libffado-2.1.0-svn2088.tar.bz2
+/libffado-2.1.0.tgz
--- a/README.ffado
+++ b/README.ffado
@ -1,8 +0,0 @@
-ffado-bridgeco-downloader  -- Firmware downloader application for BridgeCo devices
-ffado-diag                 -- FFADO diagnostic utility
-ffado-dbus-server          -- Expose the mixer features of connected FFADO devices through DBus
-ffado-fireworks-downloader -- Firmware downloader application for ECHO Fireworks devices
-ffado-mixer                -- Qt based FFADO device mixer
-
-FFADO is work in progress, hence there are no useful manpages.
-Please refer to http://www.ffado.org/ for more information.
--- a/libffado-dso-linking.patch
+++ b/libffado-dso-linking.patch
@ -1,12 +0,0 @@
-diff -rupN libffado-2.1.0.old/support/dbus/SConscript libffado-2.1.0/support/dbus/SConscript
--- libffado-2.1.0.old/support/dbus/SConscript	2011-02-02 17:51:32.000000000 -0500
-+++ libffado-2.1.0/support/dbus/SConscript	2012-06-12 20:53:36.173805796 -0400
-@@ -34,7 +34,7 @@ env = env.Clone()
- 
- env.AppendUnique( CPPPATH=["#/", "#/src"] )
- env.PrependUnique( LIBPATH=[env['build_base']+"src"] )
-env.PrependUnique( LIBS=["ffado"] )
-+env.PrependUnique( LIBS=["ffado", "pthread"] )
- 
- if not env.GetOption( "clean" ):
-     env.MergeFlags( env["DBUS1_FLAGS"] )
--- a/libffado-no_date_footer.patch
+++ b/libffado-no_date_footer.patch
@ -1,22 +0,0 @@
-diff -rupN libffado-2.1.0.old/doc/no_date_footer.html libffado-2.1.0/doc/no_date_footer.html
--- libffado-2.1.0.old/doc/no_date_footer.html	1969-12-31 19:00:00.000000000 -0500
-+++ libffado-2.1.0/doc/no_date_footer.html	2012-06-12 20:02:34.047382587 -0400
-@@ -0,0 +1,6 @@
-+<hr size="1"><address style="text-align: right;"><small>
-+Generated for $projectname by <a href="http://www.doxygen.org/
-+index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></a>
-+$doxygenversion</small></address>
-+</body>
-+</html>
-diff -rupN libffado-2.1.0.old/doc/reference.doxygen.in libffado-2.1.0/doc/reference.doxygen.in
--- libffado-2.1.0.old/doc/reference.doxygen.in	2009-12-18 13:52:13.000000000 -0500
-+++ libffado-2.1.0/doc/reference.doxygen.in	2012-06-12 20:01:46.355591137 -0400
-@@ -790,7 +790,7 @@ HTML_HEADER            =
- # each generated HTML page. If it is left blank doxygen will generate a
- # standard footer.
- 
-HTML_FOOTER            =
-+HTML_FOOTER            = no_date_footer.html
- 
- # The HTML_STYLESHEET tag can be used to specify a user-defined cascading
- # style sheet that is used by each HTML page. It can be used to
--- a/libffado.spec
+++ b/libffado.spec
@ -1,31 +1,20 @@
-%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-%endif
-
 Summary:        Free firewire audio driver library
 Name:           libffado
 Version:        2.1.0
-Release:        0.10.20120325.svn2088%{?dist}
+Release:        1%{?dist}
 # src/libutil/float_cast.h is LGPLv2+.
 # The rest is (GPLv2 or GPLv3)
 License:        LGPLv2+ and (GPLv2 or GPLv3)
 Group:          System Environment/Libraries
 URL:            http://www.ffado.org/
+Source0:        http://www.ffado.org/files/%{name}-%{version}.tgz
 # The trunk is tarballed as follows:
 # bash libffado-snapshot.sh 2088
-Source0:        %{name}-%{version}-svn2088.tar.bz2
-# Additional README file until we have proper manpages
-Source1:        README.ffado
 # The fetch script
 Source9:        libffado-snapshot.sh
 # We want the documentation for the library API only, not for the entire source:
 # http://subversion.ffado.org/ticket/293
 Patch0:         libffado-api-doc-only.patch
-# Remove dates from doc footers to prevent multilib conflict PHBZ#831405
-Patch1:         libffado-no_date_footer.patch
-# Fix DSO linking
-# http://subversion.ffado.org/ticket/355
-Patch2:         libffado-dso-linking.patch
 BuildRequires:  alsa-lib-devel
 BuildRequires:  dbus-c++-devel
 BuildRequires:  dbus-devel
@ -44,6 +33,7 @@ BuildRequires:  python2-devel
 BuildRequires:  scons
 BuildRequires:  subversion
 ExcludeArch:    s390 s390x
+Requires:       udev

 %description
 The FFADO project aims to provide a generic, open-source solution for the
@ -55,7 +45,6 @@ Summary:        Free firewire audio driver library development headers
 Group:          Development/Libraries
 License:        GPLv2 or GPLv3
 Requires:       %{name}%{?_isa} = %{version}-%{release}
-Requires:       pkgconfig

 %description devel
 Development files needed to build applications against libffado.
@ -79,10 +68,6 @@ Applications and utilities for use with libffado.
 %prep
 %setup -q
 %patch0 -p1 -b .api.doc.only
-%patch1 -p1 -b .no.date
-%patch2 -p1 -b .dso.linking
-
-cp -a %{SOURCE1} .

 # We don't want to install all tests
 sed -i '/Install/d' tests/{,*/}SConscript
@ -92,9 +77,10 @@ scons %{?_smp_mflags} \
      COMPILE_FLAGS="%{optflags} -ffast-math" \
      PREFIX=%{_prefix} \
      LIBDIR=%{_libdir} \
+      MANDIR=%{_mandir} \
+      UDEVDIR=%{_prefix}/lib/udev/rules.d/ \
      BUILD_TESTS=1

-
 %install
 scons DESTDIR=%{buildroot} install

@ -126,12 +112,12 @@ fi
 %posttrans -n ffado
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :

-
 %files
 %doc AUTHORS ChangeLog LICENSE.* README
 %{_libdir}/libffado.so.*
 %dir %{_datadir}/libffado/
 %{_datadir}/libffado/configuration
+%{_prefix}/lib/udev/rules.d/*

 %files devel
 %doc doc/reference/html/
@ -140,7 +126,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libdir}/libffado.so

 %files -n ffado
-%doc README.ffado
+%{_mandir}/man1/ffado-*.1*
 %{_bindir}/*
 %{_datadir}/libffado/*.xml
 %{_datadir}/libffado/python/
@ -150,7 +136,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/icons/hicolor/64x64/apps/ffado.png
 %{python_sitelib}/ffado/

+
 %changelog
+* Thu Sep 20 2012 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 2.1.0-1
+- Update to 2.1.0.
+- Drop upstreamed & old patches, README.Fedora file.
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-0.10.20120325.svn2088
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

--- a/2
+++ b/2
@ -1 +1 @@
-cf22e49f7b4fc4dfa2da0e65fee010dd  libffado-2.1.0-svn2088.tar.bz2
+26bce2be0b9c1fa4e614f2f494edf388  libffado-2.1.0.tgz