From 4a5387590210ed535fd3b44a5c355135fac12204 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Oct 28 2012 17:44:17 +0000 Subject: update to 1.0.7 release --- diff --git a/.gitignore b/.gitignore index c2f2ff3..cbe34dc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /nemo-1.0.2.tar.gz /nemo-1.0.3.tar.gz /nemo-1.0.5.tar.gz +/nemo-1.0.7.tar.gz diff --git a/nemo.spec b/nemo.spec index 50feaf7..5c701c0 100644 --- a/nemo.spec +++ b/nemo.spec @@ -1,23 +1,12 @@ -%global _internal_version f8f485c - -%global glib2_version 2.28.0 -%global pango_version 1.28 -%global gtk3_version 3.0.2 -%global gnome_icon_theme_version 1.1.5 -%global libxml2_version 2.4.20 -%global desktop_file_utils_version 0.7 -%global gnome_desktop3_version 2.91.4 -%global redhat_menus_version 0.25 -%global libexif_version 0.5.12 -%global exempi_version 1.99.5 -%global gobject_introspection_version 0.9.5 +%global _internal_version 66bade7 Name: nemo Summary: File manager for Cinnamon -Version: 1.0.5 -Release: 2%{?dist} +Version: 1.0.7 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: User Interface/Desktops +URL: https://github.com/linuxmint/nemo # To generate source # wget https://github.com/linuxmint/nemo/tarball/%%{_internal_version} -O nemo-%%{version}.git%%{_internal_version}.tar.gz Source0: http://leigh123linux.fedorapeople.org/pub/nemo/source/nemo-%{version}.tar.gz @@ -25,32 +14,29 @@ Source1: nemo.css Source2: gtk.css Source3: gtk-dark.css -URL: https://github.com/linuxmint/nemo -Requires: redhat-menus >= %{redhat_menus_version} -Requires: gvfs >= 1.4.0 -Requires: gnome-icon-theme >= %{gnome_icon_theme_version} -Requires: libexif >= %{libexif_version} +Requires: redhat-menus +Requires: gvfs +Requires: gnome-icon-theme Requires: gsettings-desktop-schemas -BuildRequires: glib2-devel >= %{glib2_version} -BuildRequires: pango-devel >= %{pango_version} -BuildRequires: gtk3-devel >= %{gtk3_version} -BuildRequires: libxml2-devel >= %{libxml2_version} -BuildRequires: gnome-desktop3-devel >= %{gnome_desktop3_version} -BuildRequires: intltool >= 0.40.6-2 -BuildRequires: libX11-devel -BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} -BuildRequires: libSM-devel -BuildRequires: libtool >= 1.4.2-10 -BuildRequires: libexif-devel >= %{libexif_version} -BuildRequires: exempi-devel >= %{exempi_version} -BuildRequires: gettext -BuildRequires: libselinux-devel +BuildRequires: gnome-common +BuildRequires: intltool BuildRequires: gtk-doc -BuildRequires: scrollkeeper -BuildRequires: gobject-introspection-devel >= %{gobject_introspection_version} -BuildRequires: gsettings-desktop-schemas-devel -BuildRequires: libnotify-devel +BuildRequires: rarian-compat +BuildRequires: desktop-file-utils +BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(gnome-desktop-3.0) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(libexif) +BuildRequires: pkgconfig(exempi-2.0) +BuildRequires: pkgconfig(libselinux) +BuildRequires: pkgconfig(gobject-introspection-1.0) +BuildRequires: pkgconfig(gsettings-desktop-schemas) +BuildRequires: pkgconfig(libnotify) # needed for theme subpackage BuildRequires: gnome-themes-standard @@ -59,9 +45,7 @@ BuildRequires: gnome-themes-standard # don't depend on soname, rather on exact version Requires: nemo-extensions%{?_isa} = %{version}-%{release} - -Patch0: rtl-fix.patch -Patch1: remove_open_terminal.patch +Patch0: remove_open_terminal.patch %description @@ -102,40 +86,29 @@ Nemo theme fix for Adwaita %prep %setup -q -n linuxmint-%{name}-%{_internal_version} - - -%patch0 -p1 -b .rtl-fix -%patch1 -p1 - +%patch0 -p1 +NOCONFIGURE=1 ./autogen.sh %build +%configure --disable-more-warnings \ + --disable-update-mimedb \ + --disable-schemas-compile + -gtkdocize -libtoolize -aclocal -I m4 -autoconf -autoheader -automake --add-missing - -CFLAGS="$RPM_OPT_FLAGS -g -DNEMO_OMIT_SELF_CHECK" %configure --disable-more-warnings --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 make %{?_smp_mflags} V=1 %install -export tagname=CC -make install DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool +make install DESTDIR=$RPM_BUILD_ROOT desktop-file-install --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-only-show-in GNOME \ $RPM_BUILD_ROOT%{_datadir}/applications/* - +# create extensions directoy +mkdir -p $RPM_BUILD_ROOT%{_libdir}/nemo/extensions-3.0/ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f $RPM_BUILD_ROOT%{_libdir}/*.a @@ -184,7 +157,7 @@ fi %{_datadir}/mime/packages/nemo.xml %{_bindir}/* %{_datadir}/icons/hicolor/*/apps/nemo.png -%{_datadir}/icons/hicolor/scalable/apps/nemo.svg +%{_datadir}/icons/hicolor/scalable/*/*.svg %{_datadir}/dbus-1/services/org.Nemo.service %{_mandir}/man1/nemo-connect-server.1.* %{_mandir}/man1/nemo.1.* @@ -192,8 +165,6 @@ fi %{_datadir}/GConf/gsettings/nemo.convert %{_datadir}/glib-2.0/schemas/org.nemo.gschema.xml %dir %{_libdir}/nemo/extensions-3.0/ -%{_libdir}/nemo/extensions-3.0/libnemo-sendto.so -%{_libdir}/nemo/extensions-3.0/libnemo-wallpaper.so %{_sysconfdir}/xdg/autostart/nemo-autostart.desktop %{_datadir}/dbus-1/services/org.freedesktop.NemoFileManager1.service @@ -212,6 +183,12 @@ fi %{_datadir}/gir-1.0/*.gir %changelog +* Sun Oct 28 2012 Leigh Scott - 1.0.7-1 +- update to 1.0.7 release +- change build requires style +- use autogen to prepare source +- make directory for extensions + * Sun Oct 21 2012 Leigh Scott - 1.0.5-2 - drop requires gksu-pokit diff --git a/remove_open_terminal.patch b/remove_open_terminal.patch index c3804d4..18d6e89 100644 --- a/remove_open_terminal.patch +++ b/remove_open_terminal.patch @@ -1,6 +1,6 @@ --- a/src/nemo-directory-view-ui.xml +++ b/src/nemo-directory-view-ui.xml -@@ -111,8 +111,6 @@ +@@ -113,8 +113,6 @@ @@ -9,13 +9,13 @@ -@@ -176,9 +174,6 @@ - +@@ -180,9 +178,6 @@ + - - - - - - + + + diff --git a/rtl-fix.patch b/rtl-fix.patch deleted file mode 100644 index 3c2ef62..0000000 --- a/rtl-fix.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -up nemo-2.23.90/libnemo-private/nemo-icon-container.c.rtl-fix nemo-2.23.90/libnemo-private/nemo-icon-container.c ---- nemo-2.23.90/libnemo-private/nemo-icon-container.c.rtl-fix 2008-08-18 19:04:40.000000000 -0400 -+++ nemo-2.23.90/libnemo-private/nemo-icon-container.c 2008-08-23 10:33:53.000000000 -0400 -@@ -8923,40 +8923,6 @@ nemo_icon_container_accessible_get_t - return type; - } - --#if ! defined (NEMO_OMIT_SELF_CHECK) -- --static char * --check_compute_stretch (int icon_x, int icon_y, int icon_size, -- int start_pointer_x, int start_pointer_y, -- int end_pointer_x, int end_pointer_y) --{ -- StretchState start, current; -- -- start.icon_x = icon_x; -- start.icon_y = icon_y; -- start.icon_size = icon_size; -- start.pointer_x = start_pointer_x; -- start.pointer_y = start_pointer_y; -- current.pointer_x = end_pointer_x; -- current.pointer_y = end_pointer_y; -- -- compute_stretch (&start, ¤t); -- -- return g_strdup_printf ("%d,%d:%d", -- current.icon_x, -- current.icon_y, -- current.icon_size); --} -- --void --nemo_self_check_icon_container (void) --{ -- EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 0, 0, 0, 0), "0,0:16"); -- EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 16, 16, 17, 17), "0,0:17"); -- EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 16, 16, 17, 16), "0,0:16"); -- EEL_CHECK_STRING_RESULT (check_compute_stretch (100, 100, 64, 105, 105, 40, 40), "35,35:129"); --} -- - gboolean - nemo_icon_container_is_layout_rtl (NemoIconContainer *container) - { -@@ -8994,4 +8960,39 @@ nemo_icon_container_get_layout_heigh - } - - -+#if ! defined (NEMO_OMIT_SELF_CHECK) -+ -+static char * -+check_compute_stretch (int icon_x, int icon_y, int icon_size, -+ int start_pointer_x, int start_pointer_y, -+ int end_pointer_x, int end_pointer_y) -+{ -+ StretchState start, current; -+ -+ start.icon_x = icon_x; -+ start.icon_y = icon_y; -+ start.icon_size = icon_size; -+ start.pointer_x = start_pointer_x; -+ start.pointer_y = start_pointer_y; -+ current.pointer_x = end_pointer_x; -+ current.pointer_y = end_pointer_y; -+ -+ compute_stretch (&start, ¤t); -+ -+ return g_strdup_printf ("%d,%d:%d", -+ current.icon_x, -+ current.icon_y, -+ current.icon_size); -+} -+ -+void -+nemo_self_check_icon_container (void) -+{ -+ EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 0, 0, 0, 0), "0,0:16"); -+ EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 16, 16, 17, 17), "0,0:17"); -+ EEL_CHECK_STRING_RESULT (check_compute_stretch (0, 0, 16, 16, 16, 17, 16), "0,0:16"); -+ EEL_CHECK_STRING_RESULT (check_compute_stretch (100, 100, 64, 105, 105, 40, 40), "35,35:129"); -+} -+ -+ - #endif /* ! NEMO_OMIT_SELF_CHECK */ diff --git a/sources b/sources index 7715dbf..bf80027 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a508c1997ec294e57a2684abcce99c34 nemo-1.0.5.tar.gz +73086294b06ad5cc0bfea1c9c42789f7 nemo-1.0.7.tar.gz