[mate-file-manager/f18] Revert "fix resolution, login crash, clean up spec file"

leigh123linux leigh123linux at fedoraproject.org
Tue Nov 20 00:24:09 UTC 2012 

commit 876b6402c930029fa1caf8b7a95ec920e1052d9e
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Tue Nov 20 00:23:33 2012 +0000

    Revert "fix resolution, login crash, clean up spec file"
    
    This reverts commit d4760d09417f68efda7ce7d856d8addb5aabb6e2.

 .gitignore             |    1 -
 mate-file-manager.spec |  158 +++++++++++++++++++++++------------------------
 sources                |    2 +-
 3 files changed, 78 insertions(+), 83 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0f10738..4c3e614 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 /mate-file-manager-1.4.0.tar.xz
 /mate-file-manager-1.5.0.tar.xz
-/mate-file-manager-1.5.0-GIT.tar.gz
diff --git a/mate-file-manager.spec b/mate-file-manager.spec
index 7360e1b..1490779 100644
--- a/mate-file-manager.spec
+++ b/mate-file-manager.spec
@@ -1,59 +1,59 @@
-Name:		mate-file-manager
-Summary:	File manager for MATE
-Version:	1.5.0
-Release:	4%{?dist}
-License:	GPLv2+ and LGPLv2+
-Group:		User Interface/Desktops
-URL:		http://mate-desktop.org
-Source0:	http://vicodan.fedorapeople.org/%{name}-%{version}-GIT.tar.gz
-
-Requires:	gamin
-Requires:	filesystem
-Requires:	redhat-menus
-Requires:	gvfs
-Requires:	mate-icon-theme
-Requires:	gsettings-desktop-schemas
-
-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)
-BuildRequires:	pkgconfig(gsettings-desktop-schemas)
+Name:       mate-file-manager
+Summary:    File manager for MATE
+Version:    1.5.0
+Release:    3%{?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
+Requires:   gsettings-desktop-schemas
+
+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)
+BuildRequires:  pkgconfig(gsettings-desktop-schemas)
 
 
 # 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
 
 # http://git.gnome.org/browse/nautilus/commit/?id=d3ab8e137ae957e5afef54bf0ec1e275b96caab5
 # https://github.com/mate-desktop/mate-file-manager/issues/29
-#Patch8:	close_earlier.patch
+Patch8:         close_earlier.patch
 
 
 %description
@@ -65,19 +65,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}
+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
@@ -92,21 +92,19 @@ sed -i -e 's,Categories=MATE,Categories=X-MATE,g' src/mate-network-scheme.deskto
 #patch2 -p1 -b .gvfs-desktop-key
 #patch3 -p0 -b .symlink
 #patch5 -p1 -b .no_session_delay
-#patch7 -p1 -b .docfix
-#patch8 -p1 -b .close_earlier
+%patch7 -p1 -b .docfix
+%patch8 -p1 -b .close_earlier
 
 NOCONFIGURE=1 ./autogen.sh
 
 %build
-%configure				\
-	--disable-static		\
-	--with-gnu-ld			\
-	--with-x			\
-	--disable-schemas-compile	\
-	--enable-unique			\
-	--enable-introspection		\
-	--disable-gtk-doc		\
-	--disable-update-mimedb
+
+%configure \
+        --disable-static \
+        --enable-unique \
+        --enable-introspection \
+        --enable-gtk-doc \
+        --disable-update-mimedb
 
 
 # drop unneeded direct library deps with --as-needed
@@ -117,40 +115,44 @@ make %{?_smp_mflags} V=1
 
 
 %install
-make DESTDIR=%{buildroot} 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 {} ';'
 
-find %{buildroot} -name '*.la' -exec rm -f {} ';'
-find %{buildroot} -name '*.a' -exec rm -f {} ';'
+rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
+rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/.icon-theme.cache
 
-rm -f %{buildroot}%{_datadir}/icons/hicolor/icon-theme.cache
-rm -f %{buildroot}%{_datadir}/icons/hicolor/.icon-theme.cache
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/caja/extensions-2.0
 
-mkdir -p %{buildroot}%{_libdir}/caja/extensions-2.0
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/caja-file-management-properties.desktop
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/caja-computer.desktop
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/caja-browser.desktop
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/caja-home.desktop
+desktop-file-validate $RPM_BUILD_ROOT/%{_datadir}/applications/mate-network-scheme.desktop
 
-desktop-file-validate %{buildroot}/%{_datadir}/applications/caja-file-management-properties.desktop
-desktop-file-validate %{buildroot}/%{_datadir}/applications/caja-computer.desktop
-desktop-file-validate %{buildroot}/%{_datadir}/applications/caja-browser.desktop
-desktop-file-validate %{buildroot}/%{_datadir}/applications/caja-home.desktop
-desktop-file-validate %{buildroot}/%{_datadir}/applications/mate-network-scheme.desktop
 
 %find_lang caja
 
+
 %post
 /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
-/bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+/bin/touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+
+%preun
 
 
 %postun
 if [ $1 -eq 0 ]; then
-  /bin/touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
-  /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+  /bin/touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+  /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
   /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 fi
 
 /usr/bin/update-mime-database %{_datadir}/mime &> /dev/null || :
 
 %posttrans
-/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+/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
@@ -158,7 +160,7 @@ fi
 %postun extensions -p /sbin/ldconfig
 
 
-%files -f caja.lang
+%files  -f caja.lang
 %doc AUTHORS COPYING COPYING-DOCS COPYING.LIB NEWS README
 %{_bindir}/*
 %{_datadir}/caja/
@@ -175,7 +177,6 @@ fi
 %{_datadir}/mime/packages/caja.xml
 
 %files extensions
-%doc AUTHORS COPYING COPYING-DOCS COPYING.LIB NEWS README
 %{_libdir}/libcaja-extension.so.*
 %{_libdir}/girepository-1.0/*.typelib
 
@@ -188,11 +189,6 @@ fi
 
 
 %changelog
-* Sun Nov 19 2012 Dan Mashal <dan.mashal at fedoraproject.org> - 1.5.0-4
-- Fix caja crash on resolution change
-- Update configure flags, disable gtk doc
-- Clean up spec file
-
 * Sun Nov 11 2012 Leigh Scott <leigh123linux at googlemail.com> - 1.5.0-3
 - add patch to call gdk_pixbuf_loader_close() earlier (#558267)
 - fix mistake in scriptlets
diff --git a/sources b/sources
index cce7586..f13d81a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3cc757b5a08753e95e29aa65cec615d9  mate-file-manager-1.5.0-GIT.tar.gz
+638cf154fe2312325a3a50fac4dbed02  mate-file-manager-1.5.0.tar.xz

More information about the scm-commits mailing list