- add kde3support bcond for build with kde4-kde3support, update volume patch

Changed files:
    falf-volume.patch -> 1.2
    falf.spec -> 1.8

diff --git a/falf-volume.patch b/falf-volume.patch
index 344344d9a59230c3115eb35bb2dd621466d0a55e..4c4407d10a538b6a242d9afeada9b2e630ed2318 100644 (file)
--- a/falf-volume.patch
+++ b/falf-volume.patch
@@ -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 <amdfanatyk@o2.pl>
-+    Copyright (c) 2006-2009 by amdfanatyk <amdfanatyk@o2.pl>
- 
-     *************************************************************************
-     *                                                                       *
 @@ -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 <amdfanatyk@o2.pl>
-+    Copyright (c) 2006-2011 by amdfanatyk <amdfanatyk@o2.pl>
- 
-     *************************************************************************
-     *                                                                       *
 @@ -341,6 +341,9 @@
  
        alreadyRunning = false;

diff --git a/falf.spec b/falf.spec
index 578a5f1ac09ae6cb1a231d85df261c49cd511e82..cc2bfefb130d06dc5b652cf1cc641f2f20ed6736 100644 (file)
--- a/falf.spec
+++ b/falf.spec
@@ -2,6 +2,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
@@ -13,10 +15,13 @@ Source0:    http://dl.sourceforge.net/falf/%{name}-%{version}.tar.bz2
 # 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
@@ -56,6 +61,9 @@ Atuty:
 %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