summaryrefslogtreecommitdiffstats
path: root/redhat/tdegraphics
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-02-16 21:12:46 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-02-16 21:12:46 +0900
commit5bde4cde9b86bd2b8d30aa308fa8a4c8287412d3 (patch)
treee5ed8e0ef8b269e375cc5ae3d0514e815fe54f22 /redhat/tdegraphics
parent74d6c6f82a27fc3ca51abe188461657782af75b1 (diff)
parent47f97be766d32c908a39d4dc10dc555af69c82dd (diff)
downloadtde-packaging-5bde4cde9b86bd2b8d30aa308fa8a4c8287412d3.tar.gz
tde-packaging-5bde4cde9b86bd2b8d30aa308fa8a4c8287412d3.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/tdegraphics')
-rw-r--r--redhat/tdegraphics/tdegraphics-14.0.0.spec29
1 files changed, 18 insertions, 11 deletions
diff --git a/redhat/tdegraphics/tdegraphics-14.0.0.spec b/redhat/tdegraphics/tdegraphics-14.0.0.spec
index 228574b0a..5d810a026 100644
--- a/redhat/tdegraphics/tdegraphics-14.0.0.spec
+++ b/redhat/tdegraphics/tdegraphics-14.0.0.spec
@@ -111,7 +111,11 @@ BuildRequires: %{_lib}xi-devel
# kgamma
BuildRequires: %{_lib}xxf86vm-devel
# ksvg
+%if 0%{?mgaversion} >= 4
+BuildRequires: %{_lib}xmu-devel
+%else
BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel
+%endif
# kpovmodeler
BuildRequires: %{_lib}mesagl1-devel
BuildRequires: %{_lib}mesaglu1-devel
@@ -601,29 +605,32 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
##########
-%package -n trinity-kiconedit
+%package -n trinity-tdeiconedit
Summary: An icon editor for Trinity
Group: Applications/Graphics
-%description -n trinity-kiconedit
-KIconedit allows you easily to create and edit icons.
+Obsoletes: trinity-kiconedit < %{version}-%{release}
+Provides: trinity-kiconedit = %{version}-%{release}
+
+%description -n trinity-tdeiconedit
+TDEIconedit allows you easily to create and edit icons.
-%files -n trinity-kiconedit
+%files -n trinity-tdeiconedit
%defattr(-,root,root,-)
-%{tde_bindir}/kiconedit
-%{tde_tdeappdir}/kiconedit.desktop
-%{tde_datadir}/apps/kiconedit/
-%{tde_datadir}/icons/hicolor/*/apps/kiconedit.png
-%{tde_tdedocdir}/HTML/en/kiconedit/
+%{tde_bindir}/tdeiconedit
+%{tde_tdeappdir}/tdeiconedit.desktop
+%{tde_datadir}/apps/tdeiconedit/
+%{tde_datadir}/icons/hicolor/*/apps/tdeiconedit.png
+%{tde_tdedocdir}/HTML/en/tdeiconedit/
-%post -n trinity-kiconedit
+%post -n trinity-tdeiconedit
for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||:
done
update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-%postun -n trinity-kiconedit
+%postun -n trinity-tdeiconedit
for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null ||:
gtk-update-icon-cache -q %{tde_datadir}/icons/${f} 2> /dev/null ||: