terjeros pushed to mtpaint (master). "fix build issue"

notifications at fedoraproject.org notifications at fedoraproject.org
Wed Jun 10 17:53:37 UTC 2015


From 123d1d0650924ea821a5ac1b6ab972d2bc218d35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Terje=20R=C3=B8sten?= <terje.rosten at ntnu.no>
Date: Wed, 10 Jun 2015 19:53:28 +0200
Subject: fix build issue


diff --git a/mtpaint.spec b/mtpaint.spec
index 563c9be..9e58729 100644
--- a/mtpaint.spec
+++ b/mtpaint.spec
@@ -5,7 +5,7 @@
 Summary:       Painting program for creating icons and pixel-based artwork
 Name:          mtpaint
 Version:       3.40
-Release:       17%{?dist}
+Release:       18%{?dist}
 License:       GPLv3+
 Group:         Applications/Multimedia
 URL:           http://mtpaint.sourceforge.net/
@@ -15,7 +15,6 @@ Patch0:        mtpaint-3.40-xdg-open.patch
 Patch1:        mtpaint-3.31-png.patch
 Patch2:        mtpaint-3.40-strip.patch
 Patch3:        mtpaint-3.40-yad.patch
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: giflib-devel
 BuildRequires: gtk2-devel
 BuildRequires: lcms2-devel
@@ -68,28 +67,25 @@ dos2unix -k %{name}_handbook-%{docver}/docs/{en_GB,cs}/*.html
 
 %build
 # This is not a "normal" configure
-export CFLAGS="%{optflags}"
-export LDFLAGS="%{?__global_ldflags}"
+export CFLAGS="%{optflags} -fPIC"
+export LDFLAGS="%{?__global_ldflags} -fPIC"
 ./configure \
     --prefix=%{_prefix} \
     --docdir=%{_pkgdocdir} \
     cflags asneeded intl man thread gtk2 GIF tiff jpeg jp2 imagick lcms2
-%{__make} %{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install MT_PREFIX=%{buildroot}%{_prefix}            \
-                  MT_MAN_DEST=%{buildroot}%{_mandir}          \
-                  MT_LANG_DEST=%{buildroot}%{_datadir}/locale \
-                  MT_DATAROOT=%{buildroot}%{_datadir}         \
-                  BIN_INSTALL=%{buildroot}%{_bindir}
+make install MT_PREFIX=%{buildroot}%{_prefix}            \
+             MT_MAN_DEST=%{buildroot}%{_mandir}          \
+             MT_LANG_DEST=%{buildroot}%{_datadir}/locale \
+             MT_DATAROOT=%{buildroot}%{_datadir}         \
+             BIN_INSTALL=%{buildroot}%{_bindir}
 
 desktop-file-install --delete-original         \
-%if 0%{?fedora} && 0%{?fedora} < 19
-    --vendor fedora                            \
-%endif
     --dir %{buildroot}%{_datadir}/applications \
     %{buildroot}%{_datadir}/applications/%{name}.desktop
+
 %find_lang %{name}
 
 # Register as an application to be visible in the software center
@@ -149,19 +145,20 @@ exit 0
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
-%defattr(-, root, root, -)
 %doc COPYING NEWS README
-%{_mandir}/man1/%{name}*
-%{_bindir}/%{name}
-%{_datadir}/appdata/*.appdata.xml
-%{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/%{name}.png
+%{_mandir}/man1/mtpaint.1*
+%{_bindir}/mtpaint
+%{_datadir}/appdata/mtpaint.appdata.xml
+%{_datadir}/applications/mtpaint.desktop
+%{_datadir}/pixmaps/mtpaint.png
 
 %files handbook
-%defattr(-, root, root, -)
 %doc %{name}_handbook-%{docver}/COPYING %{name}_handbook-%{docver}/docs/*
 
 %changelog
+* Wed Jun 10 2015 Terje Rosten <terje.rosten at ntnu.no> - 3.40-18
+- fix build issue
+
 * Thu Mar 26 2015 Richard Hughes <rhughes at redhat.com> - 3.40-17
 - Add an AppData file for the software center
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/mtpaint.git/commit/?h=master&id=123d1d0650924ea821a5ac1b6ab972d2bc218d35


More information about the scm-commits mailing list