[mate-utils] 1.6.0-8

[Rex Dieter]

commit 687d681624c3159341e27f15eff5d4e477b9c100
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Thu Sep 5 22:00:47 2013 -0500

    1.6.0-8
    
    - Files and libs duplicated in mate-dictionary and mate-utils (#1003196)
    - drop mate-dictionary-devel
    - add -common subpkg (for licenses, translations)
    - make main empty metapackage, that pulls all subpkgs
    - only mate-system log uses usermode (consolehelper)

 mate-utils.spec |  126 +++++++++++++++++-------------------------------------
 1 files changed, 40 insertions(+), 86 deletions(-)
---
diff --git a/mate-utils.spec b/mate-utils.spec
index 1b02cd4..627992b 100644
--- a/mate-utils.spec
+++ b/mate-utils.spec
@@ -1,6 +1,6 @@
 Name:           mate-utils
 Version:        1.6.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        MATE utility programs
 
 License:        GPLv2+ and LGPLv2+
@@ -28,54 +28,61 @@ BuildRequires:  popt-devel
 BuildRequires:  rarian-compat
 BuildRequires:  usermode
 
-Requires: mate-desktop-libs
+Requires: mate-dictionary = %{version}-%{release}
+Requires: mate-screenshot = %{version}-%{release}
+Requires: mate-search-tool = %{version}-%{release}
+Requires: mate-system-log = %{version}-%{release}
+Requires: mate-disk-usage-analyzer = %{version}-%{release}
 
 %description
 The mate-utils package contains a set of small "desk accessory" utility
 applications for MATE, such as a dictionary, a disk usage analyzer,
 a screen-shot tool and others.
 
+%package common
+Summary: Common files for %{name}
+%description common
+%{summary}.
+
 %package devel
 Summary: Development files for mate-utils
-Requires:  %{name}%{?_isa} = %{version}-%{release}
+# short-lived mate-dictionary-devel subpkg
+Obsoletes: mate-dictionary-devel < 1.6.0-8
+#Provides:  mate-dictionary-devel = %{version}-%{release}
+Requires:  mate-dictionary%{?_isa} = %{version}-%{release}
 %description devel
 The mate-utils-devel package contains header files and other resources
 needed to develop programs using the libraries contained in mate-utils.
 
 %package -n mate-system-log
 Summary: A log file viewer for the MATE desktop
+Requires: %{name}-common = %{version}-%{release}
 Requires: usermode
 %description -n mate-system-log
 An application that lets you view various system log files.
 
 %package -n mate-screenshot
 Summary: A utility to take a screen-shot of the desktop
-Requires: usermode
+Requires: %{name}-common = %{version}-%{release}
 %description -n mate-screenshot
 An application that let you take a screen-shot of your desktop.
 
 %package -n mate-dictionary
 Summary: A dictionary for MATE Desktop
-Requires: usermode
+Requires: %{name}-common = %{version}-%{release}
 %description -n mate-dictionary
 The mate-dictionary package contains a dictionary application for MATE Desktop.
 
-%package -n mate-dictionary-devel
-Summary: Development files for mate-utils
-Requires:  mate-dictionary%{?_isa} = %{version}-%{release}
-%description -n mate-dictionary-devel
-The mate-dictionary-devel package contains header files and other resources
-needed to develop programs using the libraries contained in mate-dictionary.
-
 %package -n mate-search-tool
 Summary: A file searching tool for MATE Desktop
+Requires: %{name}-common = %{version}-%{release}
 Requires: mate-desktop-libs
-
 %description -n mate-search-tool
 An application to search for files on your computer.
 
 %package -n mate-disk-usage-analyzer
 Summary: A disk usage analyzing tool for MATE Desktop
+Requires: %{name}-common = %{version}-%{release}
 %description -n mate-disk-usage-analyzer
 An application to help analyze disk usage.
 
@@ -122,8 +129,8 @@ mkdir -p  %{buildroot}%{_sbindir}
 mv %{buildroot}%{_bindir}/mate-system-log %{buildroot}%{_sbindir}
 ln -s %{_bindir}/consolehelper %{buildroot}%{_bindir}/mate-system-log
 
-rm -fv $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -fv $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/*.convert
+rm -fv %{buildroot}%{_libdir}/*.la
+rm -fv %{buildroot}%{_datadir}/MateConf/gsettings/*.convert
 
 desktop-file-install                          \
   --remove-category="MATE"                    \
@@ -141,26 +148,6 @@ hardlink -c -v %{buildroot}%{_datadir}/mate/help
 %find_lang mate-search-tool --with-gnome
 %find_lang mate-system-log --with-gnome
 
-cat mate-disk-usage-analyzer.lang >> %{name}.lang
-cat mate-dictionary.lang >> %{name}.lang
-cat mate-search-tool.lang >> %{name}.lang
-
-
-%post
-/sbin/ldconfig
-/bin/touch --no-create %{_datadir}/icons/mate &> /dev/null || :
-
-%postun
-/sbin/ldconfig
-if [ $1 -eq 0 ] ; then
-    /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/mate &> /dev/null || :
-    /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-fi
-
-%posttrans
-/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/mate &> /dev/null || :
-/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-
 
 %postun -n mate-system-log
 if [ $1 -eq 0 ] ; then
@@ -215,52 +202,19 @@ fi
 /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
-%files -f %{name}.lang
-%doc COPYING NEWS README
-%doc mate-dictionary/AUTHORS
-%doc mate-dictionary/README
-%doc baobab/AUTHORS
-%doc baobab/README
-%{_bindir}/mate-dictionary
-%{_bindir}/mate-panel-screenshot
-%{_bindir}/mate-screenshot
-%{_bindir}/mate-search-tool
-%{_bindir}/mate-disk-usage-analyzer
-%{_datadir}/applications/mate-dictionary.desktop
-%{_datadir}/applications/mate-screenshot.desktop
-%{_datadir}/applications/mate-search-tool.desktop
-%{_datadir}/applications/mate-disk-usage-analyzer.desktop
-%{_datadir}/mate-dict
-%{_datadir}/mate-dictionary
-%{_datadir}/mate-screenshot
-%{_datadir}/mate-disk-usage-analyzer
-%{_datadir}/pixmaps/mate-search-tool
-%{_libdir}/libmatedict.so.*
-%{_libexecdir}/mate-dictionary-applet
-%{_mandir}/man1/mate-dictionary.1.*
-%{_mandir}/man1/mate-search-tool.1.*
-%{_mandir}/man1/mate-screenshot.1.*
-%{_mandir}/man1/mate-disk-usage-analyzer.1.*
-%{_datadir}/mate/help/mate-dictionary
-%{_datadir}/mate/help/mate-disk-usage-analyzer
-%{_datadir}/mate/help/mate-search-tool
-%{_datadir}/dbus-1/services/org.mate.panel.applet.DictionaryAppletFactory.service
-%{_datadir}/glib-2.0/schemas/org.mate.dictionary.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.mate.disk-usage-analyzer.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.mate.screenshot.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.mate.search-tool.gschema.xml
-%{_datadir}/mate-panel/applets/org.mate.DictionaryApplet.mate-panel-applet
-%{_datadir}/icons/mate/*/apps/baobab.*
+%files
+# empty
 
+%files common -f %{name}.lang
+%doc COPYING COPYING.libs
+%doc NEWS README
 
 %files devel
 %{_libdir}/libmatedict.so
 %{_libdir}/pkgconfig/mate-dict.pc
-%{_includedir}/mate-dict
-
+%{_includedir}/mate-dict/
 
 %files -n mate-system-log -f mate-system-log.lang
-%doc COPYING
 %{_bindir}/mate-system-log
 %{_sbindir}/mate-system-log
 %{_sysconfdir}/security/console.apps/mate-system-log
@@ -271,8 +225,7 @@ fi
 %{_datadir}/mate/help/mate-system-log
 %{_mandir}/man1/mate-system-log.1.*
 
-%files -n mate-screenshot -f %{name}.lang
-%doc COPYING
+%files -n mate-screenshot
 %{_bindir}/mate-screenshot
 %{_bindir}/mate-panel-screenshot
 %{_datadir}/applications/mate-screenshot.desktop
@@ -281,12 +234,12 @@ fi
 %{_datadir}/glib-2.0/schemas/org.mate.screenshot.gschema.xml
 
 %files -n mate-dictionary -f mate-dictionary.lang
-%doc COPYING
 %doc mate-dictionary/AUTHORS
 %doc mate-dictionary/README
 %{_bindir}/mate-dictionary
-%{_datadir}/mate-dict
-%{_datadir}/mate-dictionary
+%{_datadir}/applications/mate-dictionary.desktop
+%{_datadir}/mate-dict/
+%{_datadir}/mate-dictionary/
 %{_libexecdir}/mate-dictionary-applet
 %{_libdir}/libmatedict.so.*
 %{_mandir}/man1/mate-dictionary.1.*
@@ -295,21 +248,15 @@ fi
 %{_datadir}/mate-panel/applets/org.mate.DictionaryApplet.mate-panel-applet
 %{_datadir}/dbus-1/services/org.mate.panel.applet.DictionaryAppletFactory.service
 
-%files -n mate-dictionary-devel
-%{_libdir}/libmatedict.so
-%{_libdir}/pkgconfig/mate-dict.pc
-%{_includedir}/mate-dict
-
 %files -n mate-search-tool -f mate-search-tool.lang
-%doc COPYING
 %{_bindir}/mate-search-tool
 %{_datadir}/applications/mate-search-tool.desktop
 %{_mandir}/man1/mate-search-tool.1.*
 %{_datadir}/mate/help/mate-search-tool
 %{_datadir}/glib-2.0/schemas/org.mate.search-tool.gschema.xml
+%{_datadir}/pixmaps/mate-search-tool/
 
 %files -n mate-disk-usage-analyzer -f mate-disk-usage-analyzer.lang
-%doc COPYING
 %doc baobab/AUTHORS
 %doc baobab/README
 %{_bindir}/mate-disk-usage-analyzer
@@ -322,6 +269,13 @@ fi
 
 
 %changelog
+* Thu Sep 05 2013 Rex Dieter <rdieter at fedoraproject.org> - 1.6.0-8
+- Files and libs duplicated in mate-dictionary and mate-utils (#1003196)
+- drop mate-dictionary-devel
+- add -common subpkg (for licenses, translations)
+- make main empty metapackage, that pulls all subpkgs 
+- only mate-system log uses usermode (consolehelper)
+
 * Thu Aug 08 2013 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.6.0-7
 - runtime require mate-desktop-libs for mate-search-tool
 - and main package, fix rhbz #988278