From 1a415de092d9ef1b01028573ea9f67807fcfa06f Mon Sep 17 00:00:00 2001 From: JamesNZ Date: Feb 08 2014 19:03:26 +0000 Subject: Fixed an issue with the .desktop file --- diff --git a/nitrogen-update-autoconf.patch b/nitrogen-update-autoconf.patch index b038a94..472f436 100644 --- a/nitrogen-update-autoconf.patch +++ b/nitrogen-update-autoconf.patch @@ -2004,7 +2004,7 @@ diff -ur ../nitrogen-orig/config.rpath ./config.rpath +EOF diff -ur ../nitrogen-orig/configure.ac ./configure.ac --- ../nitrogen-orig/configure.ac 2013-09-27 13:24:14.000000000 +1200 -+++ ./configure.ac 2014-01-31 08:15:33.815313660 +1300 ++++ ./configure.ac 2014-02-08 11:13:06.200185516 +1300 @@ -1,21 +1,21 @@ -AC_PREREQ(2.59) +AC_PREREQ([2.69]) @@ -2039,7 +2039,7 @@ diff -ur ../nitrogen-orig/configure.ac ./configure.ac dnl dnl Our depend list -@@ -26,52 +26,74 @@ +@@ -26,52 +26,75 @@ GTKMM2_VERSION=2.10.0 GTHREAD2_VERSION=2.6.0 @@ -2124,6 +2124,7 @@ diff -ur ../nitrogen-orig/configure.ac ./configure.ac -AC_CONFIG_FILES(Makefile src/Makefile data/Makefile data/nitrogen.desktop data/icons/Makefile po/Makefile.in) +AC_CONFIG_FILES([Makefile po/Makefile.in + data/Makefile ++ data/nitrogen.desktop + data/icons/Makefile + src/Makefile]) AC_OUTPUT @@ -2133,18 +2134,18 @@ diff -ur ../nitrogen-orig/configure.ac ./configure.ac echo "" echo "##########################################" echo "" -diff -ur ../nitrogen-orig/data/Makefile.am ./data/Makefile.am ---- ../nitrogen-orig/data/Makefile.am 2013-09-27 13:24:14.000000000 +1200 -+++ ./data/Makefile.am 2014-01-28 08:51:43.465229980 +1300 -@@ -1,7 +1,7 @@ - SUBDIRS = icons - - desktopdir = $(datadir)/applications --desktop_DATA = nitrogen.desktop -+desktop_DATA = nitrogen.desktop.in - - UPDATE_DESKTOP = update-desktop-database $(datadir)/applications || : - +diff -ur ../nitrogen-orig/data/nitrogen.desktop.in ./data/nitrogen.desktop.in +--- ../nitrogen-orig/data/nitrogen.desktop.in 2013-09-27 13:24:14.000000000 +1200 ++++ ./data/nitrogen.desktop.in 2014-02-08 16:07:46.756122827 +1300 +@@ -2,7 +2,7 @@ + Type=Application + Exec=@PACKAGE@ + Name=@PACKAGE_NAME@ +-Categories=Utility;GTK ++Categories=Utility;GTK; + Icon=@PACKAGE@ + Comment=Browse and set desktop backgrounds + Keywords=background;desktop; diff -ur ../nitrogen-orig/Makefile.am ./Makefile.am --- ../nitrogen-orig/Makefile.am 2013-09-27 13:24:14.000000000 +1200 +++ ./Makefile.am 2014-01-27 11:02:25.158758867 +1300 diff --git a/nitrogen.spec b/nitrogen.spec index c921f93..d142d5d 100644 --- a/nitrogen.spec +++ b/nitrogen.spec @@ -69,7 +69,7 @@ fi %{_datadir}/icons/hicolor/16x16/actions/wallpaper-*.png %{_datadir}/icons/hicolor/16x16/devices/video-display.png %{_datadir}/icons/hicolor/16x16/mimetypes/image-x-generic.png -%{_datadir}/applications/%{name}.desktop.in +%{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png %{_mandir}/man1/%{name}.1*