diff options
Diffstat (limited to 'redhat/applications/kstreamripper')
3 files changed, 55 insertions, 17 deletions
diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13-fix_doc_directory.patch b/redhat/applications/kstreamripper/kstreamripper-3.5.13-fix_doc_directory.patch new file mode 100644 index 000000000..c0bf88288 --- /dev/null +++ b/redhat/applications/kstreamripper/kstreamripper-3.5.13-fix_doc_directory.patch @@ -0,0 +1,9 @@ +--- kstreamripper/doc/SConscript.ORI 2012-08-06 10:50:27.856547193 +0200 ++++ kstreamripper/doc/SConscript 2012-08-06 10:50:34.599402333 +0200 +@@ -79,5 +79,5 @@ + myenv.KDEinstall( 'KDEDOC', lang+'/'+destination, folder+'/index.cache.bz2' ) + + ## Use processfolder for each documentation directory +-processfolder('en/', 'en') ++processfolder('en/', 'en', 'kstreamripper') + diff --git a/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_ldflags.patch b/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_ldflags.patch new file mode 100644 index 000000000..dbdaae544 --- /dev/null +++ b/redhat/applications/kstreamripper/kstreamripper-3.5.13-missing_ldflags.patch @@ -0,0 +1,11 @@ +--- kstreamripper/src/SConscript.ORI 2012-08-06 10:46:01.509252125 +0200 ++++ kstreamripper/src/SConscript 2012-08-06 10:46:10.021070424 +0200 +@@ -43,7 +43,7 @@ + myenv.KDEaddpaths_includes( ['./', '../'] ) + + ## Necessary libraries to link against +-myenv.KDEaddlibs( ['tqt', 'kio', 'kdeui'] ) ++myenv.KDEaddlibs( ['tqt', 'kio', 'kdeui', 'qt-mt'] ) + if env['KDEm2']>3: myenv.KDEaddlibs( ['kdnssd']) + ############################# + ## Data to install diff --git a/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec b/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec index 8ac29215a..792fa0495 100644 --- a/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec +++ b/redhat/applications/kstreamripper/trinity-kstreamripper-3.5.13.spec @@ -2,16 +2,25 @@ %define kdecomp kstreamripper # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" +%if "%{?tde_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_datadir}/doc %endif # TDE 3.5.13 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/trinity +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man +%define tde_appdir %{tde_datadir}/applications + +%define tde_tdeappdir %{tde_appdir}/kde +%define tde_tdedocdir %{tde_docdir}/kde +%define tde_tdeincludedir %{tde_includedir}/kde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} Name: trinity-%{kdecomp} @@ -27,17 +36,23 @@ Vendor: Trinity Project Packager: Francois Andriot <francois.andriot@free.fr> URL: http://www.trinitydesktop.org/ -Prefix: %{_prefix} +Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{kdecomp}-3.5.13.tar.gz Patch0: kstreamripper-3.5.13-missing_include_tqt.patch +# [kstreamripper] Missing LDFLAGS cause FTBFS on Mageia / Mandriva +Patch1: kstreamripper-3.5.13-missing_ldflags.patch + +# [kstreamripper] Fix directory of HTML documentation +Patch2: kstreamripper-3.5.13-fix_doc_directory.patch + BuildRequires: tqtinterface-devel BuildRequires: trinity-arts-devel -BuildRequires: trinity-kdelibs-devel -BuildRequires: trinity-kdebase-devel +BuildRequires: trinity-tdelibs-devel +BuildRequires: trinity-tdebase-devel BuildRequires: desktop-file-utils BuildRequires: scons @@ -52,18 +67,21 @@ you with managing/ripping your preferred streams. %prep %setup -q -n applications/%{kdecomp} %patch0 -p1 +%patch1 -p1 -b .ldflags +%patch2 -p1 -b .doc %build -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{tde_bindir}:${PATH}" +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -export CXXFLAGS="-I%{_includedir}/tqt" +export CXXFLAGS="-I%{tde_includedir}/tqt" %__make %{?_smp_mflags} %install -export PATH="%{_bindir}:${PATH}" +export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} @@ -95,10 +113,10 @@ fi %files %defattr(-,root,root,-) -%{_bindir}/kstreamripper -%{_datadir}/applnk/Utilities/kstreamripper.desktop -%{_datadir}/apps/kstreamripper/kstreamripperui.rc -%{tde_docdir}/HTML/en/en/index.cache.bz2 +%{tde_bindir}/kstreamripper +%{tde_datadir}/applnk/Utilities/kstreamripper.desktop +%{tde_datadir}/apps/kstreamripper/kstreamripperui.rc +%{tde_tdedocdir}/HTML/en/kstreamripper/ |