diff --git a/.gitignore b/.gitignore index b619e42..ecbdc2f 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /nemo-2.6.3.tar.gz /nemo-2.6.4.tar.gz /nemo-2.6.5.tar.gz +/nemo-2.6.6.tar.gz diff --git a/adwaita_style.patch b/adwaita_style.patch deleted file mode 100644 index 1c9e814..0000000 --- a/adwaita_style.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/nemo-style-fallback.css -+++ b/src/nemo-style-fallback.css -@@ -8,7 +8,6 @@ NemoPathbarButton { - color-stop (.7, shade(alpha(@bg_color, 0.8), 0.90)), - color-stop (1, shade(alpha(@bg_color, 0.8), 0.80))); - border-color: #808080; -- color: @fg_color; - -NemoPathbarButton-border-radius: 3px; - } - diff --git a/gtk-dark.css b/gtk-dark.css deleted file mode 100644 index e054e71..0000000 --- a/gtk-dark.css +++ /dev/null @@ -1,2 +0,0 @@ -@import url("resource:///org/gnome/adwaita/gtk-main-dark.css"); -@import url("apps/nemo.css"); diff --git a/gtk.css b/gtk.css deleted file mode 100644 index 1a1571c..0000000 --- a/gtk.css +++ /dev/null @@ -1,2 +0,0 @@ -@import url("resource:///org/gnome/adwaita/gtk-main.css"); -@import url("apps/nemo.css"); diff --git a/nemo.css b/nemo.css deleted file mode 100644 index 75a1188..0000000 --- a/nemo.css +++ /dev/null @@ -1,25 +0,0 @@ -/* desktop mode */ -.nemo-desktop.nemo-canvas-item { - color: @bg_color; - text-shadow: 1px 1px alpha (#000000, 0.8); -} - -.nemo-desktop.nemo-canvas-item:active { - background-image: none; - background-color: alpha (@bg_color, 0.84); - - color: @fg_color; -} - -.nemo-desktop.nemo-canvas-item:selected { - background-image: none; - background-color: alpha (@selected_bg_color, 0.84); - - color: @selected_fg_color; -} - -.nemo-desktop.nemo-canvas-item:active, -.nemo-desktop.nemo-canvas-item:prelight, -.nemo-desktop.nemo-canvas-item:selected { - text-shadow: none; -} diff --git a/nemo.spec b/nemo.spec index 92eb498..2aca6d8 100644 --- a/nemo.spec +++ b/nemo.spec @@ -2,8 +2,8 @@ Name: nemo Summary: File manager for Cinnamon -Version: 2.6.5 -Release: 2%{?dist} +Version: 2.6.6 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ Group: User Interface/Desktops URL: https://github.com/linuxmint/nemo @@ -11,11 +11,7 @@ URL: https://github.com/linuxmint/nemo # 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}.git%%{_internal_version}.tar.gz Source0: http://leigh123linux.fedorapeople.org/pub/nemo/source/nemo-%{version}.tar.gz -Source1: nemo.css -Source2: gtk.css -Source3: gtk-dark.css -Source4: nemo-fedora.gschema.override -Patch0: preferences-tweak-style-a-bit-to-match-c-s.patch +Source1: nemo-fedora.gschema.override Requires: redhat-menus Requires: gvfs @@ -44,7 +40,7 @@ BuildRequires: pkgconfig(libnotify) # don't depend on soname, rather on exact version Requires: nemo-extensions%{?_isa} = %{version}-%{release} Obsoletes: nemo-open-terminal - +Obsoletes: adwaita-nemo %description Nemo is the file manager and graphical shell for the Cinnamon desktop @@ -74,22 +70,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package provides libraries and header files needed for developing nemo extensions. -%package -n adwaita-nemo -Summary: Nemo theme fix for Adwaita -Group: User Interface/Desktops -Buildarch: noarch -Requires: gnome-themes-standard - -%description -n adwaita-nemo -Nemo theme fix for Adwaita - %prep %autosetup -p1 -# set extension directory for 64bit -%ifarch x86_64 ppc64 -sed -i -e 's@"lib"@"lib64"@g' src/nemo-extensions-list.c -%endif NOCONFIGURE=1 ./autogen.sh %build @@ -105,7 +88,7 @@ make %{?_smp_mflags} V=1 %install %{make_install} -install -D -m 0644 %{SOURCE4} $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/schemas/nemo-fedora.gschema.override +install -D -m 0644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/glib-2.0/schemas/nemo-fedora.gschema.override desktop-file-install --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ @@ -121,17 +104,6 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/nemo/extensions-3.0/*.la rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/.icon-theme.cache -# theme -mkdir -p $RPM_BUILD_ROOT%{_datadir}/themes/Adwaita-Nemo/gtk-3.0/apps -install -D -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/themes/Adwaita-Nemo/gtk-3.0/apps/ -install -D -p -m 0644 %{SOURCE2} %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/themes/Adwaita-Nemo/gtk-3.0/ -ln -s %{_datadir}/themes/Adwaita/backgrounds $RPM_BUILD_ROOT%{_datadir}/themes/Adwaita-Nemo/ -ln -s %{_datadir}/themes/Adwaita/gtk-2.0 $RPM_BUILD_ROOT%{_datadir}/themes/Adwaita-Nemo/ -ln -s %{_datadir}/themes/Adwaita/gtk-3.0/{gtk.gresource,settings.ini} $RPM_BUILD_ROOT%{_datadir}/themes/Adwaita-Nemo/gtk-3.0/ -ln -s %{_datadir}/themes/Adwaita/metacity-1 $RPM_BUILD_ROOT%{_datadir}/themes/Adwaita-Nemo/ -ln -s %{_datadir}/themes/Adwaita/index.theme $RPM_BUILD_ROOT%{_datadir}/themes/Adwaita-Nemo/index.theme - - %post /sbin/ldconfig /usr/bin/update-desktop-database &> /dev/null || : @@ -170,6 +142,7 @@ fi %{_datadir}/icons/hicolor/*/apps/nemo.png %{_datadir}/icons/hicolor/*/actions/nemo-eject.png %{_datadir}/icons/hicolor/scalable/*/*.svg +%{_datadir}/icons/hicolor/48x48/status/progress-*.png %{_datadir}/dbus-1/services/org.Nemo.service %{_datadir}/dbus-1/services/org.nemo.freedesktop.FileManager1.service %{_mandir}/man1/nemo-connect-server.1.* @@ -186,9 +159,6 @@ fi %{_libdir}/girepository-1.0/*.typelib %dir %{_libdir}/nemo -%files -n adwaita-nemo -%{_datadir}/themes/Adwaita-Nemo/ - %files devel %{_includedir}/nemo/ %{_libdir}/pkgconfig/* @@ -196,6 +166,10 @@ fi %{_datadir}/gir-1.0/*.gir %changelog +* Mon Jun 15 2015 Leigh Scott - 2.6.6-1 +- update to 2.6.6 release +- drop adwaita sub-package + * Thu Jun 11 2015 Leigh Scott - 2.6.5-2 - fix extension list for 64bit - add patch for preferences diff --git a/preferences-tweak-style-a-bit-to-match-c-s.patch b/preferences-tweak-style-a-bit-to-match-c-s.patch deleted file mode 100644 index c7296a1..0000000 --- a/preferences-tweak-style-a-bit-to-match-c-s.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 61fe1fae2ac407f37d76dafdaeb6238c4c1b7dce Mon Sep 17 00:00:00 2001 -From: Michael Webster -Date: Sun, 7 Jun 2015 20:50:11 -0400 -Subject: [PATCH] preferences: tweak style a bit to match c-s - ---- - src/nemo-file-management-properties.glade | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/src/nemo-file-management-properties.glade b/src/nemo-file-management-properties.glade -index 2b38986..625118c 100644 ---- a/src/nemo-file-management-properties.glade -+++ b/src/nemo-file-management-properties.glade -@@ -249,7 +249,6 @@ - - - False -- 5 - File Management Preferences - center - 800 -@@ -258,6 +257,7 @@ - - - True -+ 0 - False - vertical - 2 -@@ -293,10 +293,17 @@ - - True - False -+ -+ icons - - - True - False -+ - - - center -@@ -321,6 +328,9 @@ - - True - False -+ 5 -+ 5 -+ 5 - --- -2.4.2 - diff --git a/sources b/sources index 4fb5884..1ff0044 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f8cfc5c209a1d2cae04a6596cbdd3e41 nemo-2.6.5.tar.gz +fa7b60453c2b1ee22cc751dace3a91e5 nemo-2.6.6.tar.gz