pool/nitrogen
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 328910 from home:pluskalm:branches:X11:Utilities

Browse Source 
- Use url for source
- Use macro for configure
- Add patch x11_linking.patch to fix linking
- Cleanup spec file with spec-cleaner

OBS-URL: https://build.opensuse.org/request/show/328910
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/nitrogen?expand=0&rev=4
This commit is contained in:
Ondřej Súkup 2015-09-04 10:50:04 +00:00 committed by Git OBS Bridge
parent e458a8ced8
commit 8f2b9a61e9
3 changed files with 55 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nitrogen.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Fri Sep 4 09:05:05 UTC 2015 - mpluskal@suse.com
- Use url for source
- Use macro for configure
- Add patch x11_linking.patch to fix linking
- Cleanup spec file with spec-cleaner
-------------------------------------------------------------------
Wed Nov 7 14:14:46 UTC 2012 - toganm@opensuse.org

43
nitrogen.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package nitrogen
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 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
@ -19,20 +19,29 @@
Name: nitrogen
Version: 1.5.2
Release: 0
License: GPL-2.0 and CC-BY-SA-3.0
Summary: A background browser and setter for X windows
Url: http://projects.l3ib.org/nitrogen/
License: GPL-2.0 and CC-BY-SA-3.0
Group: System/X11/Utilities
Source0: %{name}-%{version}.tar.gz
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
BuildRequires: gcc-c++
BuildRequires: gtkmm2-devel
BuildRequires: fdupes
BuildRequires: pkgconfig
BuildRequires: hicolor-icon-theme
BuildRequires: libtool
BuildRequires: pkg-config
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
%description
@ -52,18 +61,13 @@ recall. Some of the features are:
its size.
* Display preview images in a tiled icon layout
%prep
%setup -q
%patch0 -p1
%build
CFLAGS="%{optflags} -fno-strict-aliasing " \
CXXFLAGS="$CFLAGS" \
CPPFLAGS="$CFLAGS" \
LIBS=-lX11 GTK2_LIBS=$LIBS LDFLAGS=-L%{_lib} \
./configure --prefix=%{_prefix}
autoreconf -fiv
%configure
make %{?_smp_mflags}
%install
@ -73,8 +77,7 @@ install -D -m 644 data/icons/%{name}-48.png %{buildroot}/%{_datadir}/pixmaps/%{n
%suse_update_desktop_file %{name} Settings DesktopSettings
%fdupes %buildroot/
%fdupes %{buildroot}/
%post
%desktop_database_post
@ -87,10 +90,10 @@ install -D -m 644 data/icons/%{name}-48.png %{buildroot}/%{_datadir}/pixmaps/%{n
%files
%defattr(-,root,root,-)
%doc COPYING AUTHORS README ChangeLog NEWS
%{_bindir}/%name
%{_datadir}/applications/%name.desktop
%{_bindir}/%{name}
%{_datadir}/applications/%{name}.desktop
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/pixmaps/%name.png
%{_mandir}/man1/%name.1.gz
%{_datadir}/pixmaps/%{name}.png
%{_mandir}/man1/%{name}.1.gz
%changelog

24
x11_linking.patch Normal file
View File

@ -0,0 +1,24 @@
From 30b50d1e3d77966cd29e27c12dbe8f12eff2175d Mon Sep 17 00:00:00 2001
From: Dave Foster <daf@minuslab.net>
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])