Excluding PPC arch on EPEL6 because of missing BR packages (log4cpp)

This commit is contained in:
sagitter 2015-11-08 13:53:17 +01:00
parent 5af5dcb822
commit a46172164c
2 changed files with 12 additions and 4 deletions

View File

@ -5,7 +5,7 @@
Name: engauge-digitizer
Summary: Convert graphs or map files into numbers
Version: 6.1
Release: 1%{?dist}
Release: 2%{?dist}
Group: Applications/Engineering
License: GPLv2+
URL: http://digitizer.sourceforge.net/
@ -20,6 +20,11 @@ Provides: %{name} = 1:%{version}-%{release}
Obsoletes: %{name} < 5.2.11
Obsoletes: %{name}-transpose < 5.2.11
##Excluding this arch because of missing BR packages (log4cpp)
%if 0%{?rhel} < 7
ExcludeArch: ppc64
%endif
## Proposed in https://bugzilla.redhat.com/show_bug.cgi?id=1182409
Source1: %{name}.appdata.xml
Source2: %{name}.svg
@ -202,7 +207,7 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/appdata
mkdir -p %{buildroot}%{_datadir}/applications
cat > %{buildroot}%{_datadir}/applications/%{name}.desktop <<EOF
[Desktop Entry]
Name=Engauge Digitizer 6.1
Name=Engauge Digitizer %{version}
Type=Application
Comment=Extract data from graphs
TryExec=engauge
@ -269,6 +274,9 @@ xvfb-run -s "-screen 0 640x480x24" -a sh -x ./build_and_run_all_tests
%license LICENSE
%changelog
* Sun Nov 08 2015 Antonio Trande <sagitter@fedoraproject.org> - 1:6.1-2
- Excluding PPC arch on EPEL6 because of missing BR packages (log4cpp)
* Sat Oct 31 2015 Antonio Trande <sagitter@fedoraproject.org> - 1:6.1-1
- Update to 6.1

View File

@ -1,6 +1,6 @@
--- src/build_and_run_all_tests.orig 2015-09-28 04:36:59.000000000 +0200
+++ src/build_and_run_all_tests 2015-09-28 11:08:36.319383842 +0200
@@ -31,7 +31,7 @@
@@ -34,7 +34,7 @@
echo "Rebuilding..."
# Make sure correct qt installation is being used, by looking for '5.' in the version number
@ -9,7 +9,7 @@
if [ -z "$VERSION5" ]
then
echo "Need Qt5";
@@ -44,7 +44,9 @@
@@ -47,7 +47,9 @@
for t in "${tests[@]}"
do
sed "s/TEST/$t/g" engauge_test_template.pro >engauge_test.pro