[libmate] update spec file, fix yum install issues
Dan Mashal
vicodan at fedoraproject.org
Mon Sep 10 05:41:07 UTC 2012
commit dd839f85f89b4a953b7cdc6acae717e2bc1c77d7
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date: Sun Sep 9 22:40:40 2012 -0700
update spec file, fix yum install issues
libmate.spec | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/libmate.spec b/libmate.spec
index ead77e4..589a2b6 100644
--- a/libmate.spec
+++ b/libmate.spec
@@ -1,19 +1,18 @@
-Summary: MATE base library
+Summary: MATE Desktop base libraries
Name: libmate
Version: 1.4.0
-Release: 3%{?dist}
+Release: 4%{?dist}
URL: http://mate-desktop.org
Source0: http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
License: GPLv2+ and LGPLv2+
Buildrequires: mate-common mate-corba-devel mate-vfs-devel mate-conf-devel libmatecomponent-devel libcanberra-devel mate-doc-utils popt-devel
-Requires: mate-conf mate-common mate-vfs
-Requires(pre): mate-conf mate-common mate-vfs-devel
-Requires(post): mate-conf mate-cmmon mate-vfs-devel
-Requires(preun): mate-conf mate-common mate-vfs-devel
+Requires(pre): mate-conf
+Requires(post): mate-conf
+Requires(preun): mate-conf
%description
-
+MATE Desktop base libraries
%package devel
Summary: Development libraries, header files and utilities for libmate
@@ -31,7 +30,14 @@ NOCONFIGURE=1 ./autogen.sh
%configure -disable-static --disable-schemas-install --disable-esd
make %{?_smp_mflags}
+%install
+make DESTDIR=%{buildroot} install
+%find_lang %{name}
+rm -rf %{buildroot}%{_libdir}/matecomponent/monikers/*.la
+rm -rf %{buildroot}%{_libdir}/*.la
+
%pre
+/sbin/ldconfig
%mateconf_schema_prepare desktop_mate_accessibility_keyboard
%mateconf_schema_prepare desktop_mate_accessibility_startup
%mateconf_schema_prepare desktop_mate_applications_at_mobility
@@ -60,7 +66,6 @@ make %{?_smp_mflags}
%mateconf_schema_upgrade desktop_mate_accessibility_keyboard
%mateconf_schema_upgrade desktop_mate_accessibility_startup
%mateconf_schema_upgrade desktop_mate_applications_at_mobility
-%mateconf_schema_upgrade desktop_mate_aplications_at_visual
%mateconf_schema_upgrade desktop_mate_applications_browser
%mateconf_schema_upgrade desktop_mate_applications_office
%mateconf_schema_upgrade desktop_mate_applications_office
@@ -76,7 +81,6 @@ make %{?_smp_mflags}
%mateconf_schema_upgrade desktop_mate_sound
%mateconf_schema_upgrade desktop_mate_thumbnail_cache
%mateconf_schema_upgrade desktop_mate_thumbnailers
-%mateconf_schema_upgrade desktop_mate_typingbreak
%postun
@@ -102,13 +106,6 @@ make %{?_smp_mflags}
%mateconf_schema_remove desktop_mate_thumbnailers
%mateconf_schema_remove desktop_mate_typingbreak
-%install
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make DESTDIR=%{buildroot} install
-%find_lang %{name}
-rm -rf %{buildroot}/%{_libdir}/matecomponent/monikers/*.la
-rm -rf %{buildroot}/%{_libdir}/*.la
-
%files -f %{name}.lang
%doc AUTHORS README
%{_mandir}/man7/*
@@ -136,7 +133,6 @@ rm -rf %{buildroot}/%{_libdir}/*.la
%{_datadir}/mate-background-properties/mate-default.xml
%{_libdir}/libmate-2.so.0.400.0
%{_libdir}/libmate-2.so.0
-%{_libdir}/matecomponent/monikers/libmoniker_extra_2.so
%{_libdir}/matecomponent/servers/MATE_Moniker_std.server
%files devel
@@ -144,10 +140,14 @@ rm -rf %{buildroot}/%{_libdir}/*.la
%{_includedir}/libmate-2.0/
%{_libdir}/libmate-2.so
%{_libdir}/pkgconfig/libmate-2.0.pc
+%{_libdir}/matecomponent/monikers/libmoniker_extra_2.so
%changelog
+* Sun Sep 09 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.0-4
+- Remove mate conf scriptlets from post section that were causing issues and fix broken dependencies, move shared library to devel package
+
* Sat Sep 01 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.0-3
-Fix broken dependencies on pkgconfig and typos
+- Fix broken dependencies on pkgconfig and typos
* Sun Aug 26 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.0-2
- Simplify devel files to own proper directory, move gtk-doc folder to devel package, removed ldconfig from pre macro, bumped release version
More information about the scm-commits
mailing list