[mate-utils] Revert "fix dependency issues and clean up spec file"
Rex Dieter
rdieter at fedoraproject.org
Thu Dec 6 19:34:15 UTC 2012
commit e5c00f91452337c65f3d7b9dc748db6e3d541d81
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Thu Dec 6 13:26:01 2012 -0600
Revert "fix dependency issues and clean up spec file"
This reverts commit bfeff556d52d3a71b1558a43ed0ab170d70bbb50.
Way too gratuitous, and introduces some bad things. In short, imo,
more bad than good. I'll try to review all the changes and pick
out the good pieces and commit separately.
mate-utils.spec | 270 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 178 insertions(+), 92 deletions(-)
---
diff --git a/mate-utils.spec b/mate-utils.spec
index 548bd58..51c4f3a 100644
--- a/mate-utils.spec
+++ b/mate-utils.spec
@@ -1,149 +1,235 @@
-%define po_package %{name}
-
Name: mate-utils
Version: 1.4.0
-Release: 5%{?dist}
-Summary: MATE utils
+Release: 4%{?dist}
+Summary: MATE utility programs
+
License: GPLv2+ and LGPLv2+
URL: http://mate-desktop.org
Source0: http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
-BuildRequires: mate-common
-BuildRequires: mate-doc-utils
-BuildRequires: mate-conf-devel
-BuildRequires: mate-corba-devel
-BuildRequires: gtk2-devel
-BuildRequires: rarian-compat
-BuildRequires: rarian-devel
-BuildRequires: libSM-devel
-BuildRequires: libcanberra-devel
-BuildRequires: libgtop2-devel
-BuildRequires: desktop-file-utils
-
-Requires(pre): mate-conf
-Requires(post): mate-conf desktop-file-utils
-Requires(preun): mate-conf desktop-file-utils
+BuildRequires: pkgconfig(mate-doc-utils)
+BuildRequires: pkgconfig(glib-2.0)
+BuildRequires: pkgconfig(gtk+-2.0)
+BuildRequires: pkgconfig(mate-desktop-2.0)
+BuildRequires: pkgconfig(libmatepanelapplet-4.0)
+#BuildRequires: pkgconfig(libmatepanelapplet-2.0)
+BuildRequires: pkgconfig(libcanberra)
+BuildRequires: pkgconfig(xmu)
+BuildRequires: pkgconfig(x11)
+BuildRequires: pkgconfig(libgtop-2.0)
+BuildRequires: pkgconfig(e2p)
+BuildRequires: pkgconfig(mateconf-2.0)
+BuildRequires: popt-devel
+BuildRequires: usermode
+BuildRequires: rarian-compat
+BuildRequires: mate-common
+BuildRequires: desktop-file-utils
+
+Requires(post): mate-conf
+Requires(preun): mate-conf
+Requires(pre): mate-conf
%description
-MATE utils
+The mate-utils package contains a set of small "desk accessory" utility
+applications for MATE, such as a dictionary, a disk usage analyzer,
+a screenshot tool and others.
+
%package devel
-Summary: Development files for mate-settings-daemon
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Summary: Development files for mate-utils
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
%description devel
-Development files for mate-panel
+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
+Group: Applications/System
+Requires: usermode
+
+%description -n mate-system-log
+The mate-system-log package contains an application that lets you
+view various system log files.
+
%prep
%setup -q
+sed -i -e 's at libmatepanelapplet-2.0@libmatepanelapplet-4.0 at g' configure.ac
NOCONFIGURE=1 ./autogen.sh
-
%build
-%configure \
- --with-gnu-ld \
- --with-x \
- --enable-gdict-applet=no \
- --disable-scrollkeeper \
- --disable-schemas-install
+%configure \
+ --disable-static \
+ --disable-scrollkeeper \
+ --disable-schemas-install \
+ --enable-gdict-applet=no
+
+sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
+
+make V=1 %{?_smp_mflags}
-make %{?_smp_mflags} V=1
%install
export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make DESTDIR=%{buildroot} install
-%find_lang %{po_package}
-find %{buildroot} -name '*.la' -exec rm -rf {} ';'
-find %{buildroot} -name '*.a' -exec rm -rf {} ';'
-
-desktop-file-install \
- --remove-category="MATE" \
- --add-category="X-Mate" \
- --delete-original \
- --dir=%{buildroot}%{_datadir}/applications \
-%{buildroot}%{_datadir}/applications/*.desktop
-
-%pre
-%mateconf_schema_prepare baobab
-%mateconf_schema_prepare mate-dictionary
-%mateconf_schema_prepare mate-screenshot
-%mateconf_schema_prepare mate-search-tool
-%mateconf_schema_prepare mate-system-log
+make install DESTDIR=$RPM_BUILD_ROOT
+unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
+# make mate-system-log use consolehelper until it starts using polkit
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
+cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/pam.d/mate-system-log
+#%%PAM-1.0
+auth include config-util
+account include config-util
+session include config-util
+EOF
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
+cat <<EOF >$RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/mate-system-log
+USER=root
+PROGRAM=/usr/sbin/mate-system-log
+SESSION=true
+FALLBACK=true
+EOF
+
+mkdir -p $RPM_BUILD_ROOT%{_sbindir}
+mv $RPM_BUILD_ROOT%{_bindir}/mate-system-log $RPM_BUILD_ROOT%{_sbindir}
+ln -s %{_bindir}/consolehelper $RPM_BUILD_ROOT%{_bindir}/mate-system-log
+
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.a
+rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la
+
+desktop-file-install --vendor "" --delete-original \
+ --remove-category=MATE \
+ --add-category=X-Mate \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ $RPM_BUILD_ROOT%{_datadir}/applications/*
+
+# save space by linking identical images in translated docs
+for n in mate-dictionary mate-disk-usage-analyzer mate-search-tool mate-system-log; do
+ helpdir=$RPM_BUILD_ROOT%{_datadir}/mate/help/$n
+ for f in $helpdir/C/figures/*.png; do
+ for d in $helpdir/*; do
+ if [ -d "$d" -a "$d" != "$helpdir/C" ]; then
+ g="$d/figures/$b"
+ if [ -f "$g" ]; then
+ if cmp -s $f $g; then
+ rm "$g"; ln -s "../../C/figures/$b" "$g"
+ fi
+ fi
+ fi
+ done
+ done
+done
+
+%find_lang %{name} --with-gnome
+%find_lang mate-disk-usage-analyzer --with-gnome
+%find_lang mate-dictionary --with-gnome
+%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 || :
/usr/bin/update-desktop-database &> /dev/null || :
-%mateconf_schema_upgrade baobab
-%mateconf_schema_upgrade mate-dictionary
-%mateconf_schema_upgrade mate-screenshot
-%mateconf_schema_upgrade mate-search-tool
-%mateconf_schema_upgrade mate-system-log
+/bin/touch --no-create %{_datadir}/icons/mate &>/dev/null || :
+
+%mateconf_schema_upgrade mate-dictionary mate-screenshot mate-search-tool baobab
+
+%pre
+%mateconf_schema_prepare mate-dictionary mate-screenshot mate-search-tool baobab
+
+%preun
+%mateconf_schema_remove mate-dictionary mate-screenshot mate-search-tool baobab
%postun
/sbin/ldconfig
/usr/bin/update-desktop-database &> /dev/null || :
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/mate &>/dev/null
- /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/mate &>/dev/null || :
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/mate &>/dev/null || :
fi
-%mateconf_schema_remove baobab
-%mateconf_schema_remove mate-dictionary
-%mateconf_schema_remove mate-screenshot
-%mateconf_schema_remove mate-search-tool
-%mateconf_schema_remove mate-system-log
%posttrans
-/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/mate &>/dev/null || :
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/mate &>/dev/null || :
+%post -n mate-system-log
+%mateconf_schema_upgrade mate-system-log
-%files -f %{po_package}.lang
-%doc AUTHORS COPYING README
-%{_mandir}/man1/mate-*.gz
-%{_sysconfdir}/mateconf/schemas/baobab.schemas
+%pre -n mate-system-log
+%mateconf_schema_prepare mate-system-log
+
+%preun -n mate-system-log
+%mateconf_schema_remove mate-system-log
+
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc COPYING NEWS README
+%doc mate-dictionary/AUTHORS
+%doc mate-dictionary/README
+%doc baobab/AUTHORS
+%doc baobab/README
%{_sysconfdir}/mateconf/schemas/mate-dictionary.schemas
%{_sysconfdir}/mateconf/schemas/mate-screenshot.schemas
%{_sysconfdir}/mateconf/schemas/mate-search-tool.schemas
-%{_sysconfdir}/mateconf/schemas/mate-system-log.schemas
+%{_sysconfdir}/mateconf/schemas/baobab.schemas
%{_bindir}/mate-dictionary
-%{_bindir}/mate-disk-usage-analyzer
%{_bindir}/mate-panel-screenshot
%{_bindir}/mate-screenshot
%{_bindir}/mate-search-tool
-%{_bindir}/mate-system-log
-%{_libdir}/libmatedict.so.*
+%{_bindir}/mate-disk-usage-analyzer
%{_datadir}/applications/mate-dictionary.desktop
-%{_datadir}/applications/mate-disk-usage-analyzer.desktop
%{_datadir}/applications/mate-screenshot.desktop
%{_datadir}/applications/mate-search-tool.desktop
-%{_datadir}/applications/mate-system-log.desktop
-%{_datadir}/icons/mate/24x24/apps/*.png
-%{_datadir}/icons/mate/scalable/apps/*.svg
-%{_datadir}/pixmaps/mate-search-tool
-%{_datadir}/mate-dict
-%{_datadir}/mate-dictionary
-%{_datadir}/mate-disk-usage-analyzer
-%{_datadir}/mate-screenshot
-%{_datadir}/mate-utils
-%{_datadir}/mate/help/mate-dictionary
-%{_datadir}/mate/help/mate-disk-usage-analyzer
-%{_datadir}/mate/help/mate-search-tool
-%{_datadir}/mate/help/mate-system-log
-%{_datadir}/omf/mate-dictionary
-%{_datadir}/omf/mate-disk-usage-analyzer
-%{_datadir}/omf/mate-search-tool
-%{_datadir}/omf/mate-system-log
+%{_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/
+#{_libexecdir}/mate-dictionary-applet
+#{_datadir}/mate-2.0/ui/MATE_DictionaryApplet.xml
+%{_libdir}/libmatedict.so.*
+#{_libdir}/matecomponent/servers/MATE_DictionaryApplet.server
+%{_mandir}/man1/mate-dictionary.1.*
+%{_mandir}/man1/mate-search-tool.1.*
+%{_mandir}/man1/mate-screenshot.1.*
+%{_mandir}/man1/mate-disk-usage-analyzer.1.*
+%{_datadir}/icons/mate/*/apps/baobab.*
+%{_datadir}/mate/help/mate-dictionary/
+%{_datadir}/mate/help/mate-disk-usage-analyzer/
+%{_datadir}/mate/help/mate-search-tool/
+
%files devel
-%{_includedir}/mate-dict
%{_libdir}/libmatedict.so
%{_libdir}/pkgconfig/mate-dict.pc
+%{_includedir}/mate-dict/
-%changelog
-* Wed Dec 05 2012 Dan Mashal <dan.mashal at fedoraproject.org> - 1.4.0-5
-- Clean up spec file and fix package dependency conflicts created by move to 1.5
+%files -n mate-system-log -f mate-system-log.lang
+%doc COPYING
+%{_bindir}/mate-system-log
+%{_sbindir}/mate-system-log
+%{_sysconfdir}/mateconf/schemas/mate-system-log.schemas
+%{_sysconfdir}/security/console.apps/mate-system-log
+%{_sysconfdir}/pam.d/mate-system-log
+%{_datadir}/mate-utils/
+%{_datadir}/applications/mate-system-log.desktop
+%{_datadir}/mate/help/mate-system-log/
+%{_mandir}/man1/mate-system-log.1.*
+
+
+%changelog
* Thu Nov 08 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.4.0-4
- rebuild for 1.5.0
More information about the scm-commits
mailing list