Author: qboosh                       Date: Sun Jun 19 09:18:09 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- separated -diag (python-based tool) and -gui (PyQt4-based mixer, on bcond)
- static lib is not built in any way, dropped bcond
- pl

---- Files affected:
packages/libffado:
   libffado.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: packages/libffado/libffado.spec
diff -u packages/libffado/libffado.spec:1.3 packages/libffado/libffado.spec:1.4
--- packages/libffado/libffado.spec:1.3 Mon Apr 18 14:48:51 2011
+++ packages/libffado/libffado.spec     Sun Jun 19 11:18:04 2011
@@ -2,36 +2,46 @@
 #
 # Conditional build:
 %bcond_without apidocs         # do not build and package API docs
-%bcond_with    static_libs     # don't build static libraries
+%bcond_without gui             # mixer utility
 #
-Summary:       Free firewire audio driver library
-#Summary(pl.UTF-8):    -
+Summary:       Free FireWire audio driver library
+Summary(pl.UTF-8):     Wolnodostępna biblioteka sterownika dźwięku FireWire
 Name:          libffado
 Version:       2.0.0
 Release:       1
-License:       GPLv2/GPLv3
+License:       GPL v2 or GPL v3
 Group:         Libraries
+#Source0Download: http://www.ffado.org/?q=node/5
 Source0:       http://www.ffado.org/files/%{name}-%{version}.tar.gz
 # Source0-md5: 89fd874731a1437043d0a57ed87c81ef
 Patch0:                %{name}-gcc4.patch
 Patch1:                %{name}-build.patch
 Patch2:                %{name}-api-doc-only.patch
 URL:           http://www.ffado.org/
-BuildRequires: dbus-devel
-BuildRequires: desktop-file-utils
+BuildRequires: dbus-devel >= 1.0
 BuildRequires: doxygen
-BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: expat-devel
+BuildRequires: jack-audio-connection-kit-devel >= 0.109.12
 BuildRequires: libiec61883-devel >= 1.1.0
-BuildRequires: libraw1394-devel
-BuildRequires: libxml++-devel
-BuildRequires: python-dbus-devel
-BuildRequires: python-PyQt4-devel
+BuildRequires: libraw1394-devel >= 1.3.0
+BuildRequires: libstdc++-devel
+BuildRequires: libxml++-devel >= 2.6.13
 BuildRequires: scons
+%if %{with apidocs}
+BuildRequires: texlive-fonts-rsfs
 BuildRequires: texlive-format-pdflatex
-Requires(post,postun):  desktop-file-utils
-Requires:       gtk-update-icon-cache
-Requires:       hicolor-icon-theme
-Suggests:      qjackctl
+# for colortbl.sty
+BuildRequires: texlive-latex-extend
+BuildRequires: texlive-makeindex
+# for ifxetex.sty needed by some package (texlive packaging error?)
+BuildRequires: texlive-xetex
+%endif
+%if %{with gui}
+BuildRequires: desktop-file-utils
+BuildRequires: python-PyQt4-devel-tools >= 4
+BuildRequires: python-dbus-devel >= 0.82.0
+%endif
+Suggests:      qjackctl >= 0.2.20.10
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -39,13 +49,17 @@
 the support of FireWire based audio devices for the Linux platform.
 It is the successor of the FreeBoB project.
 
-#%description -l pl.UTF-8
+%description -l pl.UTF-8
+Celem projektu FFADO jest dostarczenie ogólnego, mającego otwarte
+źródła rozwiązania do obsługi urządzeń dźwiękowych FireWire pod
+Linuksem. Projekt jest następcą projektu FireBoB.
 
 %package devel
 Summary:       Header files for FFADO library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki FFADO
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
+Obsoletes:     libffado-static
 
 %description devel
 Header files for FFADO library.
@@ -53,18 +67,6 @@
 %description devel -l pl.UTF-8
 Pliki nagłówkowe biblioteki FFADO.
 
-%package static
-Summary:       Static FFADO library
-Summary(pl.UTF-8):     Statyczna biblioteka FFADO
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
-
-%description static
-Static FFADO library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka FFADO.
-
 %package apidocs
 Summary:       FFADO API documentation
 Summary(pl.UTF-8):     Dokumentacja API biblioteki FFADO
@@ -76,6 +78,35 @@
 %description apidocs -l pl.UTF-8
 Dokumentacja API biblioteki FFADO.
 
+%package diag
+Summary:       FFADO diagnostic utility
+Summary(pl.UTF-8):     Narzędzie diagnostyczne FFADO
+Group:         Applications/Sound
+Requires:      %{name} = %{version}-%{release}
+
+%description diag
+FFADO diagnostic utility written in Python.
+
+%description diag -l pl.UTF-8
+Narzędzie diagnostyczne FFADO napisane w Pythonie.
+
+%package gui
+Summary:       Graphical mixer utility
+Summary(pl.UTF-8):     Graficzny mikser
+Group:         X11/Applications/Sound
+Requires(post,postun):  desktop-file-utils
+Requires:      %{name} = %{version}-%{release}
+Requires:       gtk-update-icon-cache
+Requires:       hicolor-icon-theme
+Requires:      python-PyQt4 >= 4
+Requires:      python-dbus >= 0.82.0
+
+%description gui
+Graphical mixer utility for FFADO.
+
+%description gui -l pl.UTF-8
+Graficzny mikser dla FFADO.
+
 %prep
 %setup -q
 %patch0 -p2
@@ -86,11 +117,11 @@
 export CFLAGS="%{rpmcflags} -fPIC"
 export CCFLAGS="%{rpmcxxflags} -fPIC"
 export LDFLAGS="%{rpmldflags}"
-export BUILD_STATIC_LIB=%{?with_static_libs:yes}%{!?with_static_libs:no}
 %{__scons} \
        PREFIX=%{_prefix} \
        LIBDIR=%{_libdir}
 
+
 %if %{with apidocs}
 %{__scons} doc
 %{__make} -C doc/reference/latex
@@ -104,63 +135,96 @@
 export CFLAGS="%{rpmcflags}"
 export CCFLAGS="%{rpmcxxflags}"
 export LDFLAGS="%{rpmldflags}"
-export BUILD_STATIC_LIB=%{?with_static_libs:yes}%{!?with_static_libs:no}
 
 %{__scons} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+%if %{with gui}
 # scons sucks even more
 desktop-file-install --dir $RPM_BUILD_ROOT%{_desktopdir} 
support/xdg/ffado.org-ffadomixer.desktop
 ln -s ../../../../libffado/icons/hi64-apps-ffado.png \
        $RPM_BUILD_ROOT%{_iconsdir}/hicolor/64x64/apps/ffado.png
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-/sbin/ldconfig
+%post  -p /sbin/ldconfig
+%postun        -p /sbin/ldconfig
+
+%post gui
 %update_desktop_database_post
 %update_icon_cache hicolor
 
-%postun
-/sbin/ldconfig
+%postun gui
 %update_desktop_database_postun
 %update_icon_cache hicolor
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %ghost %{_libdir}/libffado.so.2
+%doc AUTHORS ChangeLog README
+%attr(755,root,root) %{_bindir}/ffado-bridgeco-downloader
+%attr(755,root,root) %{_bindir}/ffado-dbus-server
+%attr(755,root,root) %{_bindir}/ffado-fireworks-downloader
+%attr(755,root,root) %{_bindir}/ffado-test
+%attr(755,root,root) %{_bindir}/ffado-test-isorecv
+%attr(755,root,root) %{_bindir}/ffado-test-isoxmit
+%attr(755,root,root) %{_bindir}/ffado-test-streaming
 %attr(755,root,root) %{_libdir}/libffado.so.*.*.*
-%{_datadir}/%{name}
-%{_desktopdir}/ffado.org-ffadomixer.desktop
-%{_iconsdir}/hicolor/*/apps/ffado.png
+%attr(755,root,root) %ghost %{_libdir}/libffado.so.2
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/configuration
+%dir %{_datadir}/%{name}/python
 
 %files devel
 %defattr(644,root,root,755)
-%{_libdir}/libffado.so
+%attr(755,root,root) %{_libdir}/libffado.so
 %{_includedir}/libffado
 %{_pkgconfigdir}/libffado.pc
 
-%if %{with static_libs}
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libffado.a
-%endif
-
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
 %doc doc/reference/html doc/reference/latex/*.pdf
 %endif
 
+%files diag
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/ffado-diag
+%{_datadir}/%{name}/python/ffado_diag_helpers.py
+%{_datadir}/%{name}/python/helpstrings.py
+%{_datadir}/%{name}/python/listirqinfo.py
+%{_datadir}/%{name}/python/static_info.txt
+
+%if %{with gui}
+%files gui
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/ffado-mixer
+%{_datadir}/%{name}/icons
+%{_datadir}/%{name}/python/ffado_configuration.py
+%{_datadir}/%{name}/python/ffado_dbus_util.py
+%{_datadir}/%{name}/python/ffado_panelmanager.py
+%{_datadir}/%{name}/python/ffado_panelmanagerstatusui.py
+%{_datadir}/%{name}/python/ffado_regdialog.py
+%{_datadir}/%{name}/python/ffado_regdialogui.py
+%{_datadir}/%{name}/python/ffado_registration.py
+%{_datadir}/%{name}/python/ffadomixer_config.py
+%{_datadir}/%{name}/python/mixer_*.py
+%{_desktopdir}/ffado.org-ffadomixer.desktop
+%{_iconsdir}/hicolor/*/apps/ffado.png
+%endif
+
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <[email protected]>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2011/06/19 09:18:04  qboosh
+- separated -diag (python-based tool) and -gui (PyQt4-based mixer, on bcond)
+- static lib is not built in any way, dropped bcond
+- pl
+
 Revision 1.3  2011/04/18 12:48:51  baggins
 - rel 1
 
@@ -169,4 +233,3 @@
 
 Revision 1.1  2011/04/18 12:31:07  baggins
 - initial revision
-
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libffado/libffado.spec?r1=1.3&r2=1.4&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to