[nitrogen] Rolled back to last stable release to avoid a bug in master.
James Wrigley
jamesnz at fedoraproject.org
Wed Jul 9 22:58:44 UTC 2014
commit c1bb5767cc3ece6819606db55c1908ed55f27318
Author: JamesNZ <jamesnz at fedoraproject.org>
Date: Thu Jul 10 10:58:20 2014 +1200
Rolled back to last stable release to avoid a bug in master.
nitrogen-snapshot.patch |27708 ----------------------------------------
nitrogen-update-autoconf.patch | 119 +-
nitrogen.desktop | 10 +
nitrogen.spec | 21 +-
4 files changed, 68 insertions(+), 27790 deletions(-)
---
diff --git a/nitrogen-update-autoconf.patch b/nitrogen-update-autoconf.patch
index 40c7604..d9c3564 100644
--- a/nitrogen-update-autoconf.patch
+++ b/nitrogen-update-autoconf.patch
@@ -1,6 +1,6 @@
-diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/ABOUT-NLS ./ABOUT-NLS
---- ../nitrogen-orig/ABOUT-NLS 2014-04-22 18:58:32.115721151 +1200
-+++ ./ABOUT-NLS 2014-04-22 18:59:34.606076764 +1200
+diff -ur ../nitrogen-old/ABOUT-NLS ./ABOUT-NLS
+--- ../nitrogen-old/ABOUT-NLS 2007-08-07 10:20:48.000000000 +1200
++++ ./ABOUT-NLS 2014-06-15 07:51:10.842698000 +1200
@@ -0,0 +1,1282 @@
+1 Notes on the Free Translation Project
+***************************************
@@ -1284,19 +1284,28 @@ diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/ABOUT-NLS ./ABOUT-NLS
+`coordinator at translationproject.org' to make the `.pot' files available
+to the translation teams.
+
-diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/AUTHORS ./AUTHORS
---- ../nitrogen-orig/AUTHORS 2014-04-22 18:58:32.116721109 +1200
-+++ ./AUTHORS 2014-04-22 18:59:34.606076764 +1200
-@@ -21,4 +21,4 @@
+diff -ur ../nitrogen-old/AUTHORS ./AUTHORS
+--- ../nitrogen-old/AUTHORS 2011-04-20 13:51:19.000000000 +1200
++++ ./AUTHORS 2014-06-15 07:51:10.842698000 +1200
+@@ -9,6 +9,9 @@
+ Евдокимов Сергей <usaf at rambler.ru> - patches
+ Siiseli Koulutus <tuki at siiseli.fi> - finnish translation
+ Cloudef <mailRoxas at gmail.com> - Xinerama mode resource leak fix
++ Julian Knauer <jpk at goatpr0n.de> - Xinerama/multihead --head select
++ Andrew Starr-Bochicchio <a.starr.b at gmail.com> - .desktop file
++ Evan Purkhiser <evanpurkhiser at gmail.com> - FDO thumbnails dir update
+
+ Items Ruthlessly Stolen:
+ Icon theme installer from Banshee
+@@ -18,4 +21,4 @@
Mogaal/Nion - debian packages
Smoon - Arch packages
Omp - gentoo packages
- red_alert - Fedora
+ JamesNZ - Fedora
-Only in ../nitrogen-orig: bootstrap
-diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/ChangeLog ./ChangeLog
---- ../nitrogen-orig/ChangeLog 2014-04-22 18:58:32.116721109 +1200
-+++ ./ChangeLog 2014-04-22 18:59:34.606076764 +1200
+diff -ur ../nitrogen-old/ChangeLog ./ChangeLog
+--- ../nitrogen-old/ChangeLog 2011-04-20 13:58:43.000000000 +1200
++++ ./ChangeLog 2014-06-15 07:51:10.842698000 +1200
@@ -1,3 +1,8 @@
+2013-12-19 gettextize <bug-gnu-gettext at gnu.org>
+
@@ -1306,9 +1315,9 @@ diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/ChangeLog ./ChangeLog
Tue Apr 19 21:55:56 EDT 2011 Dave Foster <daf at minuslab.net>
* Releasing 1.5.2.
* Fixed bug in Xinerama mode where X resources would be leaked on
-diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/config.rpath ./config.rpath
---- ../nitrogen-orig/config.rpath 2014-04-22 18:58:32.116721109 +1200
-+++ ./config.rpath 2014-04-22 18:59:34.607076722 +1200
+diff -ur ../nitrogen-old/config.rpath ./config.rpath
+--- ../nitrogen-old/config.rpath 2007-08-07 10:20:48.000000000 +1200
++++ ./config.rpath 2014-06-15 07:51:10.843698000 +1200
@@ -0,0 +1,690 @@
+#! /bin/sh
+# Output a system dependent set of variables, describing how to set the
@@ -2000,9 +2009,9 @@ diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/config.rpath ./config.rpath
+hardcode_minus_L="$hardcode_minus_L"
+
+EOF
-diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/configure.ac ./configure.ac
---- ../nitrogen-orig/configure.ac 2014-04-22 18:58:32.117721066 +1200
-+++ ./configure.ac 2014-04-22 18:59:34.607076722 +1200
+diff -ur ../nitrogen-old/configure.ac ./configure.ac
+--- ../nitrogen-old/configure.ac 2011-04-20 13:52:10.000000000 +1200
++++ ./configure.ac 2014-06-15 07:59:29.507376166 +1200
@@ -1,21 +1,20 @@
-AC_PREREQ(2.59)
+AC_PREREQ([2.69])
@@ -2036,7 +2045,7 @@ diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/configure.ac ./configure.ac
dnl
dnl Our depend list
-@@ -26,52 +25,76 @@
+@@ -26,49 +25,75 @@
GTKMM2_VERSION=2.10.0
GTHREAD2_VERSION=2.6.0
@@ -2059,11 +2068,10 @@ diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/configure.ac ./configure.ac
NITROGEN_LIBS="$GLIB2_LIBS $GTK2_LIBS $GTKMM2_LIBS $GTHREAD2_LIBS"
NITROGEN_CFLAGS="$GLIB2_CFLAGS $GTK2_CFLAGS $GTKMM2_CFLAGS $GTHREAD2_CFLAGS"
--dnl apparantly we have to check for X11 now
--AC_CHECK_LIB(X11, XOpenDisplay, [NITROGEN_LIBS="$NITROGEN_LIBS -lX11"])
-
-dnl do some autotools picen to get inotify
-AC_ARG_ENABLE(inotify, [ --disable-inotify disable support for inotify watching of dirs (default: enabled)], [enable_inotify=$enableval],[enable_inotify=yes])
+
+-AC_ARG_ENABLE(debug, [ --enable-debug enable debugging flags ])
+ALL_LINGUAS=""
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.16])
@@ -2087,8 +2095,7 @@ diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/configure.ac ./configure.ac
+
+# Get autotools to use inotify
+AC_ARG_ENABLE([inotify], [ --disable-inotify disable support for inotify watching of dirs (default: enabled)], [enable_inotify=$enableval],[enable_inotify=yes])
-
--AC_ARG_ENABLE(debug, [ --enable-debug enable debugging flags ])
++
+AC_ARG_ENABLE([debug], [ --enable-debug enable debugging flags ])
if test "$enable_debug" = "yes"; then
@@ -2118,11 +2125,10 @@ diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/configure.ac ./configure.ac
+AC_SUBST([NITROGEN_LIBS])
+AC_SUBST([NITROGEN_CFLAGS])
--AC_CONFIG_FILES(Makefile src/Makefile data/Makefile data/nitrogen.desktop data/icons/Makefile po/Makefile.in)
+-AC_CONFIG_FILES(Makefile src/Makefile data/Makefile 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
@@ -2132,21 +2138,9 @@ diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/configure.ac ./configure.ac
echo ""
echo "##########################################"
echo ""
-diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/data/nitrogen.desktop.in ./data/nitrogen.desktop.in
---- ../nitrogen-orig/data/nitrogen.desktop.in 2014-04-22 18:58:32.118721024 +1200
-+++ ./data/nitrogen.desktop.in 2014-04-22 18:59:34.608076680 +1200
-@@ -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 -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/Makefile.am ./Makefile.am
---- ../nitrogen-orig/Makefile.am 2014-04-22 18:58:32.116721109 +1200
-+++ ./Makefile.am 2014-04-22 18:59:34.606076764 +1200
+diff -ur ../nitrogen-old/Makefile.am ./Makefile.am
+--- ../nitrogen-old/Makefile.am 2009-02-24 09:36:54.000000000 +1300
++++ ./Makefile.am 2014-06-15 07:51:10.843698000 +1200
@@ -1,3 +1,5 @@
SUBDIRS = po src data
#DIST_SUBDIRS = data
@@ -2154,9 +2148,9 @@ diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/Makefile.am ./Makefile.am
+EXTRA_DIST = m4/ChangeLog m4/ChangeLog m4/ChangeLog m4/ChangeLog config.rpath bootstrap
+
+ACLOCAL_AMFLAGS = -I m4
-diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/po/ChangeLog ./po/ChangeLog
---- ../nitrogen-orig/po/ChangeLog 2014-04-22 18:58:32.119720981 +1200
-+++ ./po/ChangeLog 2014-04-22 18:59:34.609076638 +1200
+diff -ur ../nitrogen-old/po/ChangeLog ./po/ChangeLog
+--- ../nitrogen-old/po/ChangeLog 2007-08-07 10:20:48.000000000 +1200
++++ ./po/ChangeLog 2014-06-15 07:51:10.845698000 +1200
@@ -1,3 +1,8 @@
+2013-12-19 gettextize <bug-gnu-gettext at gnu.org>
+
@@ -2166,9 +2160,9 @@ diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/po/ChangeLog ./po/ChangeLog
2007-05-25 gettextize <bug-gnu-gettext at gnu.org>
* Makefile.in.in: New file, from gettext-0.16.1.
-diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/po/Makefile.in.in ./po/Makefile.in.in
---- ../nitrogen-orig/po/Makefile.in.in 2014-04-22 18:58:32.119720981 +1200
-+++ ./po/Makefile.in.in 2014-04-22 18:59:34.610076596 +1200
+diff -ur ../nitrogen-old/po/Makefile.in.in ./po/Makefile.in.in
+--- ../nitrogen-old/po/Makefile.in.in 2007-08-07 10:20:48.000000000 +1200
++++ ./po/Makefile.in.in 2014-06-15 07:51:10.845698000 +1200
@@ -1,5 +1,5 @@
# Makefile for PO directory in any package using GNU gettext.
-# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper at gnu.ai.mit.edu>
@@ -2341,9 +2335,9 @@ diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/po/Makefile.in.in ./po/Make
force:
-diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/po/Makevars ./po/Makevars
---- ../nitrogen-orig/po/Makevars 2014-04-22 18:58:32.119720981 +1200
-+++ ./po/Makevars 2014-04-22 18:59:34.610076596 +1200
+diff -ur ../nitrogen-old/po/Makevars ./po/Makevars
+--- ../nitrogen-old/po/Makevars 2007-08-07 10:20:48.000000000 +1200
++++ ./po/Makevars 2014-06-15 07:51:10.845698000 +1200
@@ -39,3 +39,15 @@
# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty.
@@ -2360,9 +2354,9 @@ diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/po/Makevars ./po/Makevars
+# --previous to keep previous msgids of translated messages,
+# --quiet to reduce the verbosity.
+MSGMERGE_OPTIONS =
-diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/po/Rules-quot ./po/Rules-quot
---- ../nitrogen-orig/po/Rules-quot 2014-04-22 18:58:32.120720938 +1200
-+++ ./po/Rules-quot 2014-04-22 18:59:34.610076596 +1200
+diff -ur ../nitrogen-old/po/Rules-quot ./po/Rules-quot
+--- ../nitrogen-old/po/Rules-quot 2007-08-07 10:20:48.000000000 +1200
++++ ./po/Rules-quot 2014-06-15 07:51:10.845698000 +1200
@@ -14,13 +14,13 @@
.insert-header.po-update-en:
@@ -2379,24 +2373,3 @@ diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/po/Rules-quot ./po/Rules-qu
if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
rm -f $$tmpdir/$$lang.new.po; \
else \
-diff -x '*.cc' -x '*.h' -x '.*' -ur ../nitrogen-orig/README ./README
---- ../nitrogen-orig/README 2014-04-22 18:58:32.116721109 +1200
-+++ ./README 2014-04-22 18:59:34.606076764 +1200
-@@ -8,7 +8,7 @@
-
- BUILDING:
-
-- ./bootstrap
-+ autoreconf -fi
- ./configure
- make
- make install (as root or a user with proper permissions)
-@@ -28,7 +28,7 @@
-
- CONTACT:
- If you want to tell us about the many bugs that we have, drop by #l3ib on
-- irc.freenode.net, and talk to m4re or jvd.
-+ irc.freenode.net, and talk to mz4 or jvd.
-
- LICENSE:
- Nitrogen is licensed under the GPL. See COPYING.
diff --git a/nitrogen.desktop b/nitrogen.desktop
new file mode 100644
index 0000000..f82ba96
--- /dev/null
+++ b/nitrogen.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Nitrogen
+GenericName=Nitrogen background browser and setter
+Comment=Background browser and setter for X windows
+Exec=nitrogen
+Icon=nitrogen
+Terminal=false
+Type=Application
+Categories=Settings;DesktopSettings;
+
diff --git a/nitrogen.spec b/nitrogen.spec
index abfd320..0ef018a 100644
--- a/nitrogen.spec
+++ b/nitrogen.spec
@@ -1,7 +1,6 @@
-%global checkout 20140405git
Name: nitrogen
Version: 1.5.2
-Release: 12.%{checkout}%{?dist}
+Release: 13%{?dist}
Summary: Background browser and setter for X windows
Group: User Interface/Desktops
@@ -9,8 +8,8 @@ Group: User Interface/Desktops
License: GPLv2+ and zlib and CC-BY-SA
URL: http://projects.l3ib.org/nitrogen/
Source0: http://projects.l3ib.org/%{name}/files/%{name}-%{version}.tar.gz
-Patch0: nitrogen-snapshot.patch
-Patch1: nitrogen-update-autoconf.patch
+Source1: %{name}.desktop
+Patch0: nitrogen-update-autoconf.patch
BuildRequires: gtkmm24-devel
BuildRequires: libpng-devel
BuildRequires: gettext
@@ -35,13 +34,12 @@ which determines the best mode to set an image based on its size.
%prep
%setup -q
-# patch0 updates the stable release to git snapshot
-# patch1 fixes https://bugzilla.redhat.com/show_bug.cgi?id=926238
+
+# Patch fixes https://bugzilla.redhat.com/show_bug.cgi?id=1093121
%patch0 -p1
-%patch1
%build
-autoreconf -f -i
+autoreconf -fi
%configure --disable-dependency-tracking
# -lX11 is missing (DSO: https://fedoraproject.org/wiki/UnderstandingDSOLinkChange)
@@ -50,6 +48,8 @@ make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS="-lX11"
%install
make install DESTDIR=%{buildroot}
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE1}
+
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -61,7 +61,7 @@ if [ $1 -eq 0 ] ; then
fi
%posttrans
-/usr/bin/gtk-update-icon-cache -f -t %{_datadir}/icons/hicolor &>/dev/null
+/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
@@ -77,6 +77,9 @@ fi
%changelog
+* Wed Jul 9 2014 James Wrigley <jwrigley7 at gmail.com> - 1.5.2-13
+- Rolled back to the last stable release to fix bug in master.
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.2-12.20140405git
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list