[ddccontrol] Conditionalized ddcpci build, it is build only on i686, x86_64 architectures
Jaroslav Škarvada
jskarvad at fedoraproject.org
Tue Dec 16 14:34:17 UTC 2014
commit fe945163b5ef12bf53bfcc9acbea60de0b228062
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date: Tue Dec 16 15:34:07 2014 +0100
Conditionalized ddcpci build, it is build only on i686, x86_64 architectures
- Fixed icons packaging
ddccontrol.spec | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/ddccontrol.spec b/ddccontrol.spec
index 75c37ed..d9d01cd 100644
--- a/ddccontrol.spec
+++ b/ddccontrol.spec
@@ -1,3 +1,9 @@
+%ifarch x86_64 i686
+%bcond_without ddcpci
+%else
+%bcond_with ddcpci
+%endif
+
%global git_commit c3af663de0ebae2d899469f2de7f9a4a128ff5ed
%global git_date 20120904
@@ -13,7 +19,7 @@
Name: ddccontrol
URL: http://ddccontrol.sourceforge.net/
Version: 0.4.2
-Release: 10.%{git_suffix}%{?dist}
+Release: 11.%{git_suffix}%{?dist}
License: GPLv2+
BuildRequires: gtk2-devel, pkgconfig, pciutils-devel, desktop-file-utils
BuildRequires: perl(XML::Parser), gettext, libtool, libxml2-devel, tidy
@@ -31,7 +37,7 @@ Source0: %{name}-%{version}-%{git_suffix}.tar.bz2
Source1: %{name}-modules-autoload.conf
# use autopoint instead of gettextize that is interactive tool
Patch0: %{name}-autopoint.patch
-
+# no monitors on s390(x)
ExcludeArch: s390 s390x
%description
@@ -74,7 +80,7 @@ Development files for ddccontrol.
%build
# applet is not supported on Gnome 3
%configure --enable-doc --disable-gnome-applet --prefix=%{_prefix} \
- --exec-prefix=%{_exec_prefix} --disable-rpath
+ --exec-prefix=%{_exec_prefix} --disable-rpath %{!?with_ddcpci:--disable-ddcpci}
# kill rpaths
sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
@@ -132,7 +138,9 @@ fi
%doc AUTHORS COPYING NEWS README TODO
%exclude %{_docdir}/%{name}/html
%{_bindir}/ddccontrol
+%if 0%{?with_ddcpci}
%attr(0755,root,root) %{_bindir}/ddcpci
+%endif
%{_prefix}/lib/modules-load.d/%{name}.conf
%{_libdir}/lib*.so.*
%{_mandir}/man1/ddccontrol.1*
@@ -140,7 +148,6 @@ fi
%files gtk
%{_bindir}/gddccontrol
%{_mandir}/man1/gddccontrol.1*
-%{_datadir}/icons/*
%{_datadir}/icons/hicolor/*/apps/*.png
%{_datadir}/applications/*
@@ -153,6 +160,10 @@ fi
%{_libdir}/pkgconfig/%{name}.pc
%changelog
+* Tue Dec 16 2014 Jaroslav Škarvada <jskarvad at redhat.com> - 0.4.2-11.20120904gitc3af663d
+- Conditionalized ddcpci build, it is build only on i686, x86_64 architectures
+- Fixed icons packaging
+
* Wed Dec 10 2014 David King <amigadave at amigadave.com> - 0.4.2-10.20120904gitc3af663d
- Fix directory ownership for icons and pkg-config (#1172555)
More information about the scm-commits
mailing list