jreznik pushed to taskjuggler (epel7). "Add taskjuggler.xml shared MIME-info file (..more)"

[notifications at fedoraproject.org]

>From c4b1028c3ece38ecaff0d79aef1c92fbda150406 Mon Sep 17 00:00:00 2001
From: Christoph Wickert <cwickert at fedoraproject.org>
Date: Wed, 23 Feb 2011 22:02:41 +0100
Subject: Add taskjuggler.xml shared MIME-info file Fix license tag Update
 icon-cache scriptlets Require kde-filesystem and fix directory ownership
 Remove obsolete categories from desktop file


diff --git a/taskjuggler.spec b/taskjuggler.spec
index 386892e..14af4dd 100644
--- a/taskjuggler.spec
+++ b/taskjuggler.spec
@@ -1,12 +1,13 @@
 Name:          taskjuggler
 Version:       2.4.3
-Release:       6%{?dist}
+Release:       7%{?dist}
 Summary:       Project management tool
 
 Group:         Applications/Productivity
-License:       GPL+
+License:       GPLv2
 URL:           http://www.taskjuggler.org
 Source0:       http://www.taskjuggler.org/download/%{name}-%{version}.tar.bz2
+Source1:       %{name}.xml
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{?fedora} < 10
@@ -21,8 +22,7 @@ Buildrequires: qt3 qt3-devel
 Buildrequires: xmlto
 Buildrequires: desktop-file-utils
 Requires: %{name}-libs = %{version}-%{release}
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
+Requires: kde-filesystem
 
 %description
 TaskJuggler is a modern and powerful project management tool. Its new approach
@@ -62,12 +62,12 @@ xmlto man --skip-validation man/en/TaskJugglerUI.xml
 %install
 rm -rf $RPM_BUILD_ROOT
 export DESTDIR="$RPM_BUILD_ROOT"
+# INSTALL="install -p"
 make install
 
 desktop-file-install --vendor fedora \
 	--delete-original \
 	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-	--add-category X-Fedora --add-category Application \
 	--add-category Office \
 	${RPM_BUILD_ROOT}/%{_datadir}/applications/kde/taskjuggler.desktop
 
@@ -77,6 +77,12 @@ rm $RPM_BUILD_ROOT%{_libdir}/libtaskjuggler.{la,so}
 mv $RPM_BUILD_ROOT%{_docdir}/packages/* $RPM_BUILD_ROOT%{_docdir}
 rm -rf $RPM_BUILD_ROOT%{_docdir}/packages
 
+# empty, owned by kde-filesystem
+rmdir $RPM_BUILD_ROOT%{_datadir}/applications/kde
+
+# install mime type definition
+install %{SOURCE1} -Dpm 644 ${RPM_BUILD_ROOT}/%{_datadir}/mime/packages/%{name}.xml
+
 %find_lang %{name}
 
 
@@ -86,40 +92,43 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/ldconfig
-gtk-update-icon-cache
-update-desktop-database &> /dev/null ||:
+update-desktop-database &> /dev/null || :
+update-mime-database %{_datadir}/mime &> /dev/null || :
 touch --no-create %{_datadir}/icons/{crystalsvg,hicolor} || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
 
 
 %postun
 /sbin/ldconfig
-gtk-update-icon-cache
 update-desktop-database &> /dev/null ||:
+update-mime-database %{_datadir}/mime &> /dev/null || :
 touch --no-create %{_datadir}/icons/{crystalsvg,hicolor} || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg || :
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/{crystalsvg,hicolor}
+    gtk-update-icon-cache %{_datadir}/icons/crystalsvg &>/dev/null || :
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/crystalsvg &>/dev/null || :
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/TaskJugglerUI
 %{_bindir}/taskjuggler
 %{_datadir}/applications/fedora-taskjuggler.desktop
-%{_datadir}/applications/kde
-%{_datadir}/apps/*
+%{_datadir}/apps/katepart/syntax/%{name}.xml
+%{_datadir}/apps/%{name}/
 %{_datadir}/config/taskjugglerrc
-%{_docdir}/HTML/en/*
-%dir %{_docdir}/%{name}
-%{_docdir}/%{name}/*
-%{_datadir}/icons/*
+%{_docdir}/HTML/en/%{name}/
+%{_docdir}/%{name}/
+%{_datadir}/icons/crystalsvg/*/mimetypes/*.png
+%{_datadir}/icons/hicolor/*/apps/*.png
 %{_datadir}/mimelnk/application/*.desktop
+%{_datadir}/mime/packages/%{name}.xml
 %{_mandir}/man1/*
 
 
@@ -128,6 +137,13 @@ fi
 %{_libdir}/libtaskjuggler*
 
 %changelog
+* Wed Feb 23 2011 Christoph Wickert <cwickert at fedoraproject.org> - 2.4.3-7
+- Add taskjuggler.xml shared MIME-info file
+- Fix license tag
+- Update icon-cache scriptlets
+- Require kde-filesystem and fix directory ownership
+- Remove obsolete categories from desktop file
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/taskjuggler.xml b/taskjuggler.xml
new file mode 100644
index 0000000..2a9b64b
--- /dev/null
+++ b/taskjuggler.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+   <mime-type type="application/x-tji">
+      <comment>TaskJuggler Project Include File</comment>
+      <comment xml:lang="de">TaskJuggler Projekt Include Datei</comment>
+      <icon>taskjuggler_tji</icon>
+      <generic-icon>text</generic-icon>
+      <glob pattern="*.tji"/>
+   </mime-type>
+   <mime-type type="application/x-tjp">
+      <comment>TaskJuggler Project File</comment>
+      <comment xml:lang="de">TaskJuggler Projekt Datei</comment>
+      <glob pattern="*.tjp"/>
+      <icon>taskjuggler_tjp</icon>
+      <generic-icon>text</generic-icon>   </mime-type>
+   <mime-type type="application/x-tjx">
+      <comment>TaskJuggler XML Project File</comment>
+      <comment xml:lang="de">TaskJuggler XML Projekt Datei</comment>
+      <icon>taskjuggler_tjx</icon>
+      <generic-icon>html</generic-icon>
+      <glob pattern="*.tjx"/>
+   </mime-type>
+</mime-info>
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/taskjuggler.git/commit/?h=epel7&id=c4b1028c3ece38ecaff0d79aef1c92fbda150406