summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kuickshow
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/applications/kuickshow')
-rw-r--r--redhat/applications/kuickshow/kuickshow-3.5.13-missing_ldflags.patch11
-rw-r--r--redhat/applications/kuickshow/trinity-kuickshow-3.5.12.spec47
-rw-r--r--redhat/applications/kuickshow/trinity-kuickshow-3.5.13.spec76
3 files changed, 83 insertions, 51 deletions
diff --git a/redhat/applications/kuickshow/kuickshow-3.5.13-missing_ldflags.patch b/redhat/applications/kuickshow/kuickshow-3.5.13-missing_ldflags.patch
new file mode 100644
index 000000000..8028d1941
--- /dev/null
+++ b/redhat/applications/kuickshow/kuickshow-3.5.13-missing_ldflags.patch
@@ -0,0 +1,11 @@
+--- kuickshow/kuickshow/src/Makefile.am.ORI 2012-08-06 11:35:57.271341272 +0200
++++ kuickshow/kuickshow/src/Makefile.am 2012-08-06 11:36:20.916830749 +0200
+@@ -10,7 +10,7 @@
+ METASOURCES = AUTO
+
+ kuickshow_la_LDFLAGS = $(all_libraries) -module -avoid-version
+-kuickshow_la_LIBADD = $(LIB_KDEPRINT) $(LIB_IMLIB)
++kuickshow_la_LIBADD = $(LIB_KDEPRINT) $(LIB_IMLIB) $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) $(LIB_KIO)
+ kuickshow_la_SOURCES = kuickshow.cpp \
+ aboutwidget.cpp generalwidget.cpp kuickconfigdlg.cpp main.cpp \
+ defaultswidget.cpp imagewindow.cpp kuickdata.cpp \
diff --git a/redhat/applications/kuickshow/trinity-kuickshow-3.5.12.spec b/redhat/applications/kuickshow/trinity-kuickshow-3.5.12.spec
index 307f9f0cc..bf7c79c3b 100644
--- a/redhat/applications/kuickshow/trinity-kuickshow-3.5.12.spec
+++ b/redhat/applications/kuickshow/trinity-kuickshow-3.5.12.spec
@@ -6,14 +6,14 @@
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
%define _variant .opt
-%define _docdir %{_prefix}/share/doc
+%define _docdir %{tde_prefix}/share/doc
%endif
# TDE 3.5.12 specific building variables
BuildRequires: autoconf automake libtool m4
%define tde_docdir %{_docdir}
-%define tde_includedir %{_includedir}/kde
-%define tde_libdir %{_libdir}/kde3
+%define tde_includedir %{tde_includedir}/kde
+%define tde_libdir %{tde_libdir}/kde3
Name: trinity-%{kdecomp}
@@ -33,8 +33,8 @@ Source0: %{kdecomp}-3.5.12.tar.gz
Conflicts: trinity-kdegraphics
BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
BuildRequires: desktop-file-utils
BuildRequires: imlib-devel
@@ -53,19 +53,20 @@ Clicking on an image shows the image in its normal size.
%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}"
%configure \
--disable-rpath \
- --with-extra-includes=%{_includedir}/tqt \
+ --with-extra-includes=%{tde_includedir}/tqt \
--enable-closure
%__make %{?_smp_mflags}
%install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%make_install
@@ -75,26 +76,26 @@ export PATH="%{_bindir}:${PATH}"
%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
-%{_bindir}/*
-%{_datadir}/applications/*/*.desktop
-%{_datadir}/apps/*/
-%{tde_docdir}/HTML/en/*/
-%{_datadir}/icons/*/*/*/*
-%{_libdir}/libkdeinit_%{kdecomp}.so
-
-%exclude %{_libdir}/*.la
-%exclude %{_libdir}/*/*.so
-%exclude %{_libdir}/*/*.la
+%{tde_bindir}/*
+%{tde_datadir}/applications/*/*.desktop
+%{tde_datadir}/apps/*/
+%{tde_tdedocdir}/HTML/en/*/
+%{tde_datadir}/icons/*/*/*/*
+%{tde_libdir}/libkdeinit_%{kdecomp}.so
+
+%exclude %{tde_libdir}/*.la
+%exclude %{tde_libdir}/*/*.so
+%exclude %{tde_libdir}/*/*.la
%Changelog
diff --git a/redhat/applications/kuickshow/trinity-kuickshow-3.5.13.spec b/redhat/applications/kuickshow/trinity-kuickshow-3.5.13.spec
index 88a8e2fec..aa01c55fb 100644
--- a/redhat/applications/kuickshow/trinity-kuickshow-3.5.13.spec
+++ b/redhat/applications/kuickshow/trinity-kuickshow-3.5.13.spec
@@ -2,16 +2,25 @@
%define kdecomp kuickshow
# 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}
@@ -38,10 +47,12 @@ Patch1: bp001-28d9c774.diff
Patch2: bp002-bdeb8b3a.diff
# [kuickshow] Remove inadvertent renaming [Commit #d97e403f] [Bug #863]
Patch3: bp003-d97e403f.diff
+# [kuickshow] Missing LDFLAGS cause FTBFS on Mageia / Mandriva
+Patch4: kuickshow-3.5.13-missing_ldflags.patch
BuildRequires: tqtinterface-devel
-BuildRequires: trinity-kdelibs-devel
-BuildRequires: trinity-kdebase-devel
+BuildRequires: trinity-tdelibs-devel
+BuildRequires: trinity-tdebase-devel
BuildRequires: desktop-file-utils
BuildRequires: imlib-devel
@@ -57,12 +68,13 @@ Clicking on an image shows the image in its normal size.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1 -b .ldflags
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
%__sed -i admin/acinclude.m4.in \
- -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \
- -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g"
+ -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
+ -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -70,19 +82,27 @@ Clicking on an image shows the image in its normal size.
%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}"
%configure \
- --disable-rpath \
- --with-extra-includes=%{_includedir}/tqt \
- --enable-closure
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --datadir=%{tde_datadir} \
+ --libdir=%{tde_libdir} \
+ --mandir=%{tde_mandir} \
+ --includedir=%{tde_tdeincludedir} \
+ --disable-rpath \
+ --with-extra-includes=%{tde_includedir}/tqt \
+ --enable-closure
%__make %{?_smp_mflags}
%install
-export PATH="%{_bindir}:${PATH}"
+export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{?buildroot}
@@ -92,27 +112,27 @@ export PATH="%{_bindir}:${PATH}"
%post
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
/sbin/ldconfig
%postun
-touch --no-create %{_datadir}/icons/hicolor || :
-gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+touch --no-create %{tde_datadir}/icons/hicolor || :
+gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
/sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING
-%{_bindir}/*
-%{_datadir}/applications/*/*.desktop
-%{_datadir}/apps/*/
-%{_datadir}/icons/hicolor/*/*/*
-%{_libdir}/lib[kt]deinit_%{kdecomp}.so
-%{_libdir}/*.la
-%{tde_libdir}/*.so
+%{tde_bindir}/*
+%{tde_datadir}/applications/*/*.desktop
+%{tde_datadir}/apps/*/
+%{tde_datadir}/icons/hicolor/*/*/*
+%{tde_libdir}/lib[kt]deinit_%{kdecomp}.so
%{tde_libdir}/*.la
-%{tde_docdir}/HTML/en/*/
+%{tde_tdelibdir}/*.so
+%{tde_tdelibdir}/*.la
+%{tde_tdedocdir}/HTML/en/*/
%Changelog