[libmate/f17] add libtool path to make flags
Dan Mashal
vicodan at fedoraproject.org
Tue Sep 11 01:39:04 UTC 2012
commit 35480cba1a4ba1ada2d84e193a508c09d01e6a15
Author: Dan Mashal <dan.mashal at fedoraproject.org>
Date: Mon Sep 10 18:38:15 2012 -0700
add libtool path to make flags
libmate.spec | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/libmate.spec b/libmate.spec
index 589a2b6..4b4eb7d 100644
--- a/libmate.spec
+++ b/libmate.spec
@@ -1,8 +1,8 @@
Summary: MATE Desktop base libraries
Name: libmate
Version: 1.4.0
-Release: 4%{?dist}
-URL: http://mate-desktop.org
+Release: 6%{?dist}
+URL: http://mate-desktop.org
Source0: http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
License: GPLv2+ and LGPLv2+
@@ -31,12 +31,14 @@ NOCONFIGURE=1 ./autogen.sh
make %{?_smp_mflags}
%install
-make DESTDIR=%{buildroot} install
+export MATECONF_DISABLE_MAKE_FILE_SCHEMA INSTALL=1
+make LIBTOOL="/usr/bin/libtool" DESTDIR=%{buildroot} install
%find_lang %{name}
rm -rf %{buildroot}%{_libdir}/matecomponent/monikers/*.la
rm -rf %{buildroot}%{_libdir}/*.la
-%pre
+
+%post
/sbin/ldconfig
%mateconf_schema_prepare desktop_mate_accessibility_keyboard
%mateconf_schema_prepare desktop_mate_accessibility_startup
@@ -58,11 +60,6 @@ rm -rf %{buildroot}%{_libdir}/*.la
%mateconf_schema_prepare desktop_mate_thumbnail_cache
%mateconf_schema_prepare desktop_mate_thumbnailers
%mateconf_schema_prepare desktop_mate_typingbreak
-
-
-
-%post
-/sbin/ldconfig
%mateconf_schema_upgrade desktop_mate_accessibility_keyboard
%mateconf_schema_upgrade desktop_mate_accessibility_startup
%mateconf_schema_upgrade desktop_mate_applications_at_mobility
@@ -82,7 +79,6 @@ rm -rf %{buildroot}%{_libdir}/*.la
%mateconf_schema_upgrade desktop_mate_thumbnail_cache
%mateconf_schema_upgrade desktop_mate_thumbnailers
-
%postun
/sbin/ldconfig
%mateconf_schema_remove desktop_mate_accessibility_keyboard
@@ -143,6 +139,12 @@ rm -rf %{buildroot}%{_libdir}/*.la
%{_libdir}/matecomponent/monikers/libmoniker_extra_2.so
%changelog
+* Mon Sep 10 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.0-6
+- Add libtool path for make.
+
+* Mon Sep 10 2012 Dan Mashal <dan.mashal at fedoraproject.org> 1.4.0-5
+- Remove pre scriptlet and move upgrade macros to post section
+
* 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
More information about the scm-commits
mailing list