rpms/gimp
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Spec cleanup

Browse Source
This commit is contained in:
Josef Ridky 2018-01-17 09:25:53 +01:00
parent abf4f75706
commit e8ba2d4aa1
1 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gimp.spec
View File

@ -18,12 +18,8 @@
# convenience: install convenience symlinks # convenience: install convenience symlinks
%bcond_without convenience %bcond_without convenience
# gudev: use gudev to discover special input devices # gudev: use gudev to discover special input devices
%if ! 0%{?fedora}%{?rhel} || 0%{?fedora} >= 15 || 0%{?rhel} >= 7 # use gudev from Fedora 15/RHEL7 on
# use gudev from F-15/RHEL7 on
%bcond_without gudev %bcond_without gudev
%else
%bcond_with gudev
%endif
# aalib: build with AAlib (ASCII art gfx library) # aalib: build with AAlib (ASCII art gfx library)
%if 0%{?rhel} %if 0%{?rhel}
# don't use aalib on RHEL # don't use aalib on RHEL
@ -35,11 +31,8 @@
# certain types of exploits # certain types of exploits
%bcond_without hardening %bcond_without hardening
# poppler: use from version 0.20 on which is GPLv2/GPLv3 dual-licensed # poppler: use from version 0.20 on which is GPLv2/GPLv3 dual-licensed
%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} >= 18 || 0%{?rhel} >= 7 # use from Fedora 18/RHEL
%bcond_without poppler %bcond_without poppler
%else
%bcond_with poppler
%endif
# helpbrowser build webkit-based help browser # helpbrowser build webkit-based help browser
%if 0%{?rhel} || 0%{?fedora} >= 26 %if 0%{?rhel} || 0%{?fedora} >= 26
%bcond_with helpbrowser %bcond_with helpbrowser
@ -123,7 +116,7 @@ BuildRequires: fontconfig-devel >= 2.2.0
BuildRequires: freetype-devel >= 2.1.7 BuildRequires: freetype-devel >= 2.1.7
BuildRequires: gdk-pixbuf2-devel >= 2.24.1 BuildRequires: gdk-pixbuf2-devel >= 2.24.1
BuildRequires: gegl-devel >= 0.2.0 BuildRequires: gegl-devel >= 0.2.0
%if 0%{?fedora} > 27 %if 0%{?fedora} > 27 || 0%{?rhel} >= 8
BuildRequires: libgs-devel BuildRequires: libgs-devel
%else %else
BuildRequires: ghostscript-devel BuildRequires: ghostscript-devel
@ -159,11 +152,7 @@ BuildRequires: python2-devel
BuildRequires: pygtk2-devel >= 2.10.4 BuildRequires: pygtk2-devel >= 2.10.4
BuildRequires: pygobject2-devel BuildRequires: pygobject2-devel
%if %{with helpbrowser} %if %{with helpbrowser}
%if 0%{?fedora}%{?rhel} == 0 || 0%{?fedora} > 10 || 0%{?rhel} > 5
BuildRequires: webkitgtk-devel >= 1.6.1 BuildRequires: webkitgtk-devel >= 1.6.1
%else
BuildRequires: WebKit-gtk-devel >= 1.6.1
%endif
%endif %endif
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: libX11-devel BuildRequires: libX11-devel
@ -317,17 +306,14 @@ EOF
%endif %endif
%build %build
#allow python2 package for RHEL-8
export RHEL_ALLOW_PYTHON2_FOR_BUILD=1
%if %{with hardening} %if %{with hardening}
# Use hardening compiler/linker flags because gimp is likely to deal with files # Use hardening compiler/linker flags because gimp is likely to deal with files
# coming from untrusted sources # coming from untrusted sources
%if ! 0%{?fedora}%{?rhel} || 0%{?fedora} >= 16 || 0%{?rhel} >= 7 # used from Fedora 16/RHEL7
%global _hardened_build 1 %global _hardened_build 1
%else
# fake things
export CFLAGS='-fPIC %{optflags}'
export CXXFLAGS='-fPIC %{optflags}'
export LDFLAGS='-pie'
%endif
%endif %endif
%configure \ %configure \
CFLAGS="$CFLAGS -fno-strict-aliasing" \ CFLAGS="$CFLAGS -fno-strict-aliasing" \
@ -651,6 +637,7 @@ make check
%changelog %changelog
* Tue Jan 16 2018 Josef Ridky <jridky@redhat.com> - 2:2.8.22-4 * Tue Jan 16 2018 Josef Ridky <jridky@redhat.com> - 2:2.8.22-4
- Fix dependencies for F28+ (ghostscript-devel => libgs-devel) #1534656 - Fix dependencies for F28+ (ghostscript-devel => libgs-devel) #1534656
- Update spec file for F28+/RHEL purposes
* Fri Jan 05 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2:2.8.22-3.1 * Fri Jan 05 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2:2.8.22-3.1
- Remove obsolete scriptlets - Remove obsolete scriptlets