summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kuickshow
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-07-09 21:04:33 +0200
committerFrancois Andriot <francois.andriot@free.fr>2012-07-09 21:04:33 +0200
commitd93278155946c9d82d43a8f5a6b02a7b51f356b5 (patch)
tree62cdb901f178c18ace44ee3784da41111d00d43c /redhat/applications/kuickshow
parent4647c085f8ccbde2c07722e6556116fcd5e6db2c (diff)
downloadtde-packaging-d93278155946c9d82d43a8f5a6b02a7b51f356b5.tar.gz
tde-packaging-d93278155946c9d82d43a8f5a6b02a7b51f356b5.zip
RHEL/Fedora: lots of updates
Diffstat (limited to 'redhat/applications/kuickshow')
-rw-r--r--redhat/applications/kuickshow/trinity-kuickshow-3.5.13.spec17
1 files changed, 9 insertions, 8 deletions
diff --git a/redhat/applications/kuickshow/trinity-kuickshow-3.5.13.spec b/redhat/applications/kuickshow/trinity-kuickshow-3.5.13.spec
index b8b2e347a..88a8e2fec 100644
--- a/redhat/applications/kuickshow/trinity-kuickshow-3.5.13.spec
+++ b/redhat/applications/kuickshow/trinity-kuickshow-3.5.13.spec
@@ -1,7 +1,5 @@
# Default version for this component
%define kdecomp kuickshow
-%define version 0.8.13
-%define release 3
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -18,8 +16,8 @@ BuildRequires: autoconf automake libtool m4
Name: trinity-%{kdecomp}
Summary: Quick picture viewer for KDE
-Version: %{?version}
-Release: %{?release}%{?dist}%{?_variant}
+Version: 0.8.13
+Release: 4%{?dist}%{?_variant}
License: GPLv2+
Group: Applications/Utilities
@@ -28,6 +26,8 @@ Vendor: Trinity Project
Packager: Francois Andriot <francois.andriot@free.fr>
URL: http://www.trinitydesktop.org/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
Source0: %{kdecomp}-3.5.13.tar.gz
# [kuickshow] Rename old tq methods that no longer need a unique name [Commit #8712ab46]
@@ -39,8 +39,6 @@ Patch2: bp002-bdeb8b3a.diff
# [kuickshow] Remove inadvertent renaming [Commit #d97e403f] [Bug #863]
Patch3: bp003-d97e403f.diff
-Conflicts: trinity-kdegraphics
-
BuildRequires: tqtinterface-devel
BuildRequires: trinity-kdelibs-devel
BuildRequires: trinity-kdebase-devel
@@ -109,15 +107,18 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%{_bindir}/*
%{_datadir}/applications/*/*.desktop
%{_datadir}/apps/*/
-%{tde_docdir}/HTML/en/*/
%{_datadir}/icons/hicolor/*/*/*
-%{_libdir}/libkdeinit_%{kdecomp}.so
+%{_libdir}/lib[kt]deinit_%{kdecomp}.so
%{_libdir}/*.la
%{tde_libdir}/*.so
%{tde_libdir}/*.la
+%{tde_docdir}/HTML/en/*/
%Changelog
+* Mon Jul 09 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-3
+- Removes conflict with 'kdegraphics'
+
* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.13-3
- Rename old tq methods that no longer need a unique name [Commit #8712ab46]
- Remove additional unneeded tq method conversions [Commit #28d9c774]