Author: cactus Date: Wed Apr 13 22:19:13 2011 GMT Module: packages Tag: HEAD ---- Log message: - add kde3support bcond for build with kde4-kde3support, update volume patch
---- Files affected: packages/falf: falf-volume.patch (1.1 -> 1.2) , falf.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: packages/falf/falf-volume.patch diff -u packages/falf/falf-volume.patch:1.1 packages/falf/falf-volume.patch:1.2 --- packages/falf/falf-volume.patch:1.1 Wed Apr 13 23:31:36 2011 +++ packages/falf/falf-volume.patch Thu Apr 14 00:19:08 2011 @@ -76,13 +76,6 @@ --- frmmain.ui.h 2008/09/16 19:41:09 274 +++ frmmain.ui.h 2009/04/21 20:44:39 275 -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2006-2008 by amdfanatyk <[email protected]> -+ Copyright (c) 2006-2009 by amdfanatyk <[email protected]> - - ************************************************************************* - * * @@ -571,6 +571,8 @@ player.setPos(frame); sldPos->setValue(frame); @@ -166,13 +159,6 @@ #endif --- frmmain.ui.h 2010/12/30 19:27:09 291 +++ frmmain.ui.h 2011/01/01 00:39:30 292 -@@ -1,5 +1,5 @@ - /* -- Copyright (c) 2006-2010 by amdfanatyk <[email protected]> -+ Copyright (c) 2006-2011 by amdfanatyk <[email protected]> - - ************************************************************************* - * * @@ -341,6 +341,9 @@ alreadyRunning = false; ================================================================ Index: packages/falf/falf.spec diff -u packages/falf/falf.spec:1.7 packages/falf/falf.spec:1.8 --- packages/falf/falf.spec:1.7 Wed Apr 13 23:31:36 2011 +++ packages/falf/falf.spec Thu Apr 14 00:19:08 2011 @@ -3,6 +3,8 @@ # TODO: # - prepare patch to Makefile (install) +%bcond_without kde3support + Summary: Lightweight music player with multiplaylists for KDE Summary(pl.UTF-8): Lekki odtwarzacz muzyki z wieloma listami odtwarzania dla KDE Name: falf @@ -14,10 +16,13 @@ # Source0-md5: d26042a930c6a166630591abbeffe6fb Patch0: %{name}-volume.patch URL: http://falf.sourceforge.net/ +BuildConflicts: kde4-kdelibs-devel BuildRequires: gettext-devel -BuildRequires: kdelibs-devel >= 9:3.2.0 +%{!?with_kde3support:BuildRequires: kdelibs-devel >= 9:3.2.0} +%{?with_kde3support:BuildRequires: kde4-kde3support-devel} BuildRequires: qmake >= 3.3.0 BuildRequires: rpmbuild(macros) >= 1.129 +BuildRequires: sed >= 4.0 BuildRequires: taglib-devel BuildRequires: xine-lib-devel Requires: xine-plugin-audio @@ -57,6 +62,9 @@ %setup -q %patch0 -p0 +%{?with_kde3support:%{__sed} -i 's:/usr/include/kde:/usr/include/kde3:' falf.pro} +%{?with_kde3support:%{__sed} -i 's:/usr/kde/3.5/lib:/usr/%{_lib}/kde3dev:' falf.pro} + %build export QTDIR=%{_prefix} qmake @@ -96,6 +104,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.8 2011/04/13 22:19:08 cactus +- add kde3support bcond for build with kde4-kde3support, update volume patch + Revision 1.7 2011/04/13 21:31:36 cactus - add voume patch ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/falf/falf-volume.patch?r1=1.1&r2=1.2&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/falf/falf.spec?r1=1.7&r2=1.8&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
