From 3465d19e33960317732ab54abdc0d823eb6b528ca9bec4e97e99bc09bd755285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Sat, 25 Jun 2016 12:05:47 +0000 Subject: [PATCH 1/2] new meta OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/nitrogen?expand=0&rev=6 --- nitrogen.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nitrogen.spec b/nitrogen.spec index 5e0eb20..f711820 100644 --- a/nitrogen.spec +++ b/nitrogen.spec @@ -1,7 +1,7 @@ # # spec file for package nitrogen # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 505c12eb5abc8901322aa97c8b57a1a0176124b9b5351cfffb5f2a7650b13619 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Wed, 23 May 2018 11:14:20 +0000 Subject: [PATCH 2/2] Accepting request 611537 from home:jubalh:branches:X11:Utilities - Update to 1.6.1: * Root window detection for windows such as conky fixed (#40, #90, #88, #86, #89) * Fixed Mutter detection, added wrapped mode for mutter (#78) * Respect $PREFIX for application data (@berkley4, #70) * Don't set show desktop key for Nemo (#91) * No-op when Apply is pressed and nothing is selected (#92) * Translations now install again (#64) * Xinerama disabled compilation fix (@jer-gentoo, #84) * Random codepath if statement fix (#85) * README spelling error (@gfa, #82) - Changes for 1.6.0: New features: * Keyboard shortcuts (#10) * Select head on command line with (--head) (@jaypikay, #13) * Exit confirmation dialog (@jameh, #33) * Can restore original background in X if changes not confirmed * Sorting and recursion pref options (@easysid, #47, #23) * Icon view with captions (#15) * Random background selector (Ctrl+R or --random) * Mutter support (#61) * LXDE support (#63, #80) * SVG image file support (@Vladimir-csp, #75) Issues fixed: * Autotools issue with X11 (#12) * Add desktop file (@andrewsomething, @Vladimir-csp, #28, #29, #74) * Freedesktop spec fix (@EvanPurkhiser, #30) * Nautilus detection fixes (#52, #59) * XDG system dir fix (Unit193, #41) * Don't let Xinerama mode set heads that don't exist (#55) * Xinerama fullscreen issue/detection (#59) OBS-URL: https://build.opensuse.org/request/show/611537 OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/nitrogen?expand=0&rev=7 --- nitrogen-1.5.2.tar.gz | 3 --- nitrogen-1.6.1.tar.gz | 3 +++ nitrogen.changes | 44 +++++++++++++++++++++++++++++++++++++++++++ nitrogen.spec | 33 +++++++++++++------------------- x11_linking.patch | 24 ----------------------- 5 files changed, 60 insertions(+), 47 deletions(-) delete mode 100644 nitrogen-1.5.2.tar.gz create mode 100644 nitrogen-1.6.1.tar.gz delete mode 100644 x11_linking.patch diff --git a/nitrogen-1.5.2.tar.gz b/nitrogen-1.5.2.tar.gz deleted file mode 100644 index 56016ee..0000000 --- a/nitrogen-1.5.2.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60a2437ce6a6c0ba44505fc8066c1973140d4bb48e1e5649f525c7b0b8bf9fd2 -size 307356 diff --git a/nitrogen-1.6.1.tar.gz b/nitrogen-1.6.1.tar.gz new file mode 100644 index 0000000..14286d0 --- /dev/null +++ b/nitrogen-1.6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f40213707b7a3be87e556f65521cef8795bd91afda13dfac8f00c3550375837d +size 314332 diff --git a/nitrogen.changes b/nitrogen.changes index 2d424a5..c0aa86f 100644 --- a/nitrogen.changes +++ b/nitrogen.changes @@ -1,3 +1,47 @@ +------------------------------------------------------------------- +Wed May 23 10:44:18 UTC 2018 - mvetter@suse.com + +- Update to 1.6.1: + * Root window detection for windows such as conky fixed (#40, #90, #88, #86, #89) + * Fixed Mutter detection, added wrapped mode for mutter (#78) + * Respect $PREFIX for application data (@berkley4, #70) + * Don't set show desktop key for Nemo (#91) + * No-op when Apply is pressed and nothing is selected (#92) + * Translations now install again (#64) + * Xinerama disabled compilation fix (@jer-gentoo, #84) + * Random codepath if statement fix (#85) + * README spelling error (@gfa, #82) +- Changes for 1.6.0: + New features: + * Keyboard shortcuts (#10) + * Select head on command line with (--head) (@jaypikay, #13) + * Exit confirmation dialog (@jameh, #33) + * Can restore original background in X if changes not confirmed + * Sorting and recursion pref options (@easysid, #47, #23) + * Icon view with captions (#15) + * Random background selector (Ctrl+R or --random) + * Mutter support (#61) + * LXDE support (#63, #80) + * SVG image file support (@Vladimir-csp, #75) + Issues fixed: + * Autotools issue with X11 (#12) + * Add desktop file (@andrewsomething, @Vladimir-csp, #28, #29, #74) + * Freedesktop spec fix (@EvanPurkhiser, #30) + * Nautilus detection fixes (#52, #59) + * XDG system dir fix (Unit193, #41) + * Don't let Xinerama mode set heads that don't exist (#55) + * Xinerama fullscreen issue/detection (#59) + * Man pages (#20) + Internal: + * Major refactor of setter code/organization, easier to support external background setters (gnome/lxde/xfce etc) (#25) + * Autotools refactor (@JamesNZ/@JamesWrigley, #42, #45) + * Whitespace cleanup (@jubalh, #56) + * Notes for packagers about C++11 (@rtlanceroad, #65) +- Add language package +- Add appdata file +- Remove iconcach and desktop file update in post/postun +- Remove x11_linking.patch: upstreamed + ------------------------------------------------------------------- Fri Sep 4 09:05:05 UTC 2015 - mpluskal@suse.com diff --git a/nitrogen.spec b/nitrogen.spec index f711820..312c2e5 100644 --- a/nitrogen.spec +++ b/nitrogen.spec @@ -1,7 +1,7 @@ # # spec file for package nitrogen # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,14 @@ Name: nitrogen -Version: 1.5.2 +Version: 1.6.1 Release: 0 Summary: A background browser and setter for X windows -License: GPL-2.0 and CC-BY-SA-3.0 +License: GPL-2.0-only AND CC-BY-SA-3.0 Group: System/X11/Utilities Url: http://projects.l3ib.org/nitrogen/ Source0: http://projects.l3ib.org/nitrogen/files/%{name}-%{version}.tar.gz Source1: %{name}.desktop -# upstream fix 30b50d1e3d77966cd29e27c12dbe8f12eff2175d -Patch0: x11_linking.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: fdupes @@ -34,15 +32,14 @@ BuildRequires: gcc-c++ BuildRequires: gtkmm2-devel BuildRequires: hicolor-icon-theme BuildRequires: libtool -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(xinerama) Requires: hicolor-icon-theme -Requires(post): update-desktop-files -Requires(postun): update-desktop-files -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Recommends: %{name}-lang +%lang_package %description @@ -63,7 +60,6 @@ recall. Some of the features are: %prep %setup -q -%patch0 -p1 %build autoreconf -fiv @@ -72,28 +68,25 @@ make %{?_smp_mflags} %install %make_install -install -D -m 644 %{SOURCE1} %{buildroot}/%{_datadir}/applications/%{name}.desktop install -D -m 644 data/icons/%{name}-48.png %{buildroot}/%{_datadir}/pixmaps/%{name}.png %suse_update_desktop_file %{name} Settings DesktopSettings %fdupes %{buildroot}/ -%post -%desktop_database_post -%icon_theme_cache_post +%find_lang %{name} -%postun -%desktop_database_postun -%icon_theme_cache_postun +%files lang -f %{name}.lang +%{_datadir}/locale/*/LC_MESSAGES/nitrogen.mo %files -%defattr(-,root,root,-) -%doc COPYING AUTHORS README ChangeLog NEWS +%license COPYING +%doc AUTHORS README ChangeLog NEWS %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/*/*.png %{_datadir}/pixmaps/%{name}.png -%{_mandir}/man1/%{name}.1.gz +%{_mandir}/man1/%{name}.1%{?ext_man} +%{_datadir}/appdata/nitrogen.appdata.xml %changelog diff --git a/x11_linking.patch b/x11_linking.patch deleted file mode 100644 index 909304a..0000000 --- a/x11_linking.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 30b50d1e3d77966cd29e27c12dbe8f12eff2175d Mon Sep 17 00:00:00 2001 -From: Dave Foster -Date: Wed, 28 Mar 2012 21:28:33 -0400 -Subject: [PATCH] Explicitly check for X11 lib in configure.ac, possibly fixes - #12 - ---- - configure.ac | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 05fa03b..aa4dc42 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -39,6 +39,9 @@ PKG_CHECK_MODULES(GTHREAD2, [gthread-2.0 >= $GTHREAD2_VERSION]) - 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]) -