[mate-file-manager] update to 1.5.0 release
leigh123linux
leigh123linux at fedoraproject.org
Mon Oct 29 11:06:27 UTC 2012
commit 4e21f8437757bfe0358356f564b744c9d8b4e9bb
Author: leigh123linux <leigh123linux at googlemail.com>
Date: Mon Oct 29 11:06:09 2012 +0000
update to 1.5.0 release
.gitignore | 1 +
mate-file-manager.spec | 184 ++++++++++++++++++++----------------------------
sources | 2 +-
3 files changed, 78 insertions(+), 109 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c1ceb63..4c3e614 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/mate-file-manager-1.4.0.tar.xz
+/mate-file-manager-1.5.0.tar.xz
diff --git a/mate-file-manager.spec b/mate-file-manager.spec
index 42c3ac1..b72dfed 100644
--- a/mate-file-manager.spec
+++ b/mate-file-manager.spec
@@ -1,70 +1,53 @@
-%global desktop_file_utils_version 0.7
-%global mate_desktop_version 1.1.0
-%global redhat_menus_version 0.25
-%global startup_notification_version 0.5
-%global libexif_version 0.5.12
-%global mateconf_version 1.1.0
-%global exempi_version 1.99.2
-%global unique_version 1.0.4
-%global mate_icon_theme_version 1.1.0
-%global gobject_introspection_version 0.6.4
-
-Name: mate-file-manager
-Summary: File manager for MATE
-Version: 1.4.0
-Release: 12%{?dist}
-License: GPLv2+ and LGPLv2+
-Group: User Interface/Desktops
-Source0: http://pub.mate-desktop.org/releases/1.4/%{name}-%{version}.tar.xz
-
-URL: http://mate-desktop.org
-Requires: gamin
-Requires: filesystem >= 2.1.1-1
-Requires: redhat-menus >= %{redhat_menus_version}
-Requires: gvfs >= 1.4.0
-Requires: mate-icon-theme >= %{mate_icon_theme_version}
-Requires: libexif >= %{libexif_version}
-
-BuildRequires: mate-desktop-devel >= %{mate_desktop_version}
-BuildRequires: libSM-devel
-BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
-BuildRequires: startup-notification-devel >= %{startup_notification_version}
-BuildRequires: libexif-devel >= %{libexif_version}
-BuildRequires: exempi-devel >= %{exempi_version}
-BuildRequires: libselinux-devel
-BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version}
-BuildRequires: unique-devel >= %{unique_version}
-BuildRequires: mate-conf-devel >= %{mateconf_version}
-BuildRequires: mate-common
-BuildRequires: cairo-gobject-devel
-BuildRequires: libxml2-devel
-BuildRequires: dbus-glib-devel
-
-Requires(pre): mate-conf >= %{mateconf_version}
-Requires(preun): mate-conf >= %{mateconf_version}
-Requires(post): mate-conf >= %{mateconf_version}
-Requires: mate-desktop >= %{mate_desktop_version}
+Name: mate-file-manager
+Summary: File manager for MATE
+Version: 1.5.0
+Release: 1%{?dist}
+License: GPLv2+ and LGPLv2+
+Group: User Interface/Desktops
+URL: http://mate-desktop.org
+Source0: http://pub.mate-desktop.org/releases/1.5/%{name}-%{version}.tar.xz
+
+Requires: gamin
+Requires: filesystem
+Requires: redhat-menus
+Requires: gvfs
+Requires: mate-icon-theme
+
+BuildRequires: pkgconfig(mate-desktop-2.0)
+BuildRequires: pkgconfig(sm)
+BuildRequires: desktop-file-utils
+BuildRequires: pkgconfig(libstartup-notification-1.0)
+BuildRequires: pkgconfig(libexif)
+BuildRequires: pkgconfig(exempi-2.0)
+BuildRequires: pkgconfig(libselinux)
+BuildRequires: pkgconfig(gobject-introspection-1.0)
+BuildRequires: pkgconfig(unique-1.0)
+BuildRequires: mate-common
+BuildRequires: pkgconfig(cairo-gobject)
+BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(dbus-glib-1)
+BuildRequires: pkgconfig(pangox)
# the main binary links against libcaja-extension.so
# don't depend on soname, rather on exact version
-Requires: %{name}-extensions%{?_isa} = %{version}-%{release}
+Requires: %{name}-extensions%{?_isa} = %{version}-%{release}
# Some changes to default config
-Patch0: caja-config.patch
+Patch0: caja-config.patch
-Patch1: caja-rtl-fix.patch
+Patch1: caja-rtl-fix.patch
-Patch2: caja-gvfs-desktop-key-2.patch
+Patch2: caja-gvfs-desktop-key-2.patch
# http://bugzilla.gnome.org/show_bug.cgi?id=519743
-Patch3: caja-filetype-symlink-fix.patch
+Patch3: caja-filetype-symlink-fix.patch
-Patch5: no_session_delay.patch
-Patch6: signal_curtain.patch
+Patch5: no_session_delay.patch
+Patch6: signal_curtain.patch
# upstreamable, don't reference non-existent doc xml file
-Patch7: mate-file-manager-1.4.0-docfix.patch
+Patch7: mate-file-manager-1.4.0-docfix.patch
%description
@@ -76,20 +59,19 @@ files and launch applications associated with them.
It is also responsible for handling the icons on the MATE desktop.
%package extensions
-Summary: Mate-file-manager extensions library
-License: LGPLv2+
-Group: Development/Libraries
-Requires: %{name}%{?_isa} = %{version}-%{release}
+Summary: Mate-file-manager extensions library
+License: LGPLv2+
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description extensions
This package provides the libraries used by caja extensions.
%package devel
-Summary: Support for developing mate-file-manager extensions
-License: LGPLv2+
-Group: Development/Libraries
-Requires: %{name}%{?_isa} = %{version}-%{release}
-Requires: pkgconfig
+Summary: Support for developing mate-file-manager extensions
+License: LGPLv2+
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
This package provides libraries and header files needed
@@ -99,12 +81,11 @@ for developing caja extensions.
%setup -q
sed -i -e 's,Categories=MATE,Categories=X-MATE,g' src/mate-network-scheme.desktop.in data/caja*desktop*
-%patch0 -p1 -b .config
-%patch1 -p1 -b .caja-rtl-fix
-%patch2 -p1 -b .gvfs-desktop-key
-%patch3 -p0 -b .symlink
-%patch5 -p1 -b .no_session_delay
-%patch6 -p1 -b .signal_curtain.patch
+#patch0 -p1 -b .config
+#patch1 -p1 -b .caja-rtl-fix
+#patch2 -p1 -b .gvfs-desktop-key
+#patch3 -p0 -b .symlink
+#patch5 -p1 -b .no_session_delay
%patch7 -p1 -b .docfix
NOCONFIGURE=1 ./autogen.sh
@@ -112,38 +93,22 @@ NOCONFIGURE=1 ./autogen.sh
%build
%configure \
- --disable-static \
- --enable-unique \
- --enable-introspection \
- --enable-gtk-doc \
- --disable-update-mimedb
+ --disable-static \
+ --enable-unique \
+ --enable-introspection \
+ --enable-gtk-doc \
+ --disable-update-mimedb
# drop unneeded direct library deps with --as-needed
# libtool doesn't make this easy, so we do it the hard way
sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' libtool
-export tagname=CC
-LANG=en_US make %{?_smp_mflags} V=1
+make %{?_smp_mflags} V=1
-# strip unneeded translations from .mo files
-cd po
-grep -v ".*[.]desktop[.]in.*\|.*[.]server[.]in$" POTFILES.in > POTFILES.keep
-mv POTFILES.keep POTFILES.in
-intltool-update --pot
-for p in *.po; do
- msgmerge $p caja.pot > $p.out
- msgfmt -o `basename $p .po`.gmo $p.out
-done
-
-# refresh the files in ./po after touching POTFILES.in
-make
%install
-export MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-export tagname=CC
-make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool INSTALL="install -p"
-unset MATECONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
@@ -163,27 +128,24 @@ desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/mate-network-sche
%find_lang caja
-%pre
-%mateconf_schema_prepare apps_caja_preferences
-
%post
-%mateconf_schema_upgrade apps_caja_preferences
/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
/bin/touch --no-create %{_datadir}/icons/mate >&/dev/null || :
%preun
-%mateconf_schema_remove apps_caja_preferences
+
%postun
if [ $1 -eq 0 ]; then
/bin/touch --no-create %{_datadir}/icons/mate >&/dev/null || :
- %{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+ /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
fi
-
+/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
/usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
+/usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
%post extensions -p /sbin/ldconfig
@@ -192,35 +154,41 @@ fi
%files -f caja.lang
%doc AUTHORS COPYING COPYING-DOCS COPYING.LIB NEWS README
-%{_datadir}/caja
-%{_datadir}/pixmaps/caja
+%{_bindir}/*
+%{_datadir}/caja/
+%{_libdir}/caja/extensions-2.0/
+%{_datadir}/pixmaps/caja/
%{_datadir}/applications/caja-*.desktop
%{_datadir}/applications/caja.desktop
%{_datadir}/applications/mate-network-scheme.desktop
-%{_bindir}/*
-%{_sysconfdir}/mateconf/schemas/*
%{_datadir}/icons/hicolor/*/apps/caja.png
%{_datadir}/icons/hicolor/scalable/apps/caja.svg
-%{_mandir}/man1/caja-connect-server.1.*
-%{_mandir}/man1/caja-file-management-properties.1.*
-%{_mandir}/man1/caja.1.*
+%{_datadir}/glib-2.0/schemas/org.mate.*.gschema.xml
+%{_mandir}/man1/caja-*.1.*
%{_libexecdir}/caja-convert-metadata
%{_datadir}/mime/packages/caja.xml
%files extensions
%{_libdir}/libcaja-extension.so.*
%{_libdir}/girepository-1.0/*.typelib
-%{_libdir}/caja/extensions-2.0
%files devel
+%doc %{_datadir}/gtk-doc/html/libcaja-extension/
%{_includedir}/caja
%{_libdir}/pkgconfig/*
%{_libdir}/*.so
%{_datadir}/gir-1.0/*.gir
-%doc %{_datadir}/gtk-doc/html/libcaja-extension/
%changelog
+* Mon Oct 29 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.0-1
+- update to 1.5.1 release
+- add schema scriptlets and remove mateconf scriptlets
+- drop un-needed requires and build requires and change style
+- make directory for extensions and move to main package
+- drop all patches not needed for building for now
+- clean up spec file
+
* Thu Oct 18 2012 Rex Dieter <rdieter at fedoraproject.org> - 1.4.0-12
- fix mate-doc xml error (patch out reference to non-existent caja-extension-i18n.xml)
- verbose build
diff --git a/sources b/sources
index 7a0a9bd..f13d81a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-82403e57f167dd474ada357b2c75758a mate-file-manager-1.4.0.tar.xz
+638cf154fe2312325a3a50fac4dbed02 mate-file-manager-1.5.0.tar.xz
More information about the scm-commits
mailing list