From cd694cbca3f5439e5cb0f1009b828938bb1da092 Mon Sep 17 00:00:00 2001 From: vascom Date: Sep 08 2017 14:04:20 +0000 Subject: [PATCH 1/2] Cleanup octave.spec I hope this cleanup changes can make spec file more simple and accurate with Fedora packaging guidelines. --- diff --git a/octave.spec b/octave.spec index ab183a7..cf592eb 100644 --- a/octave.spec +++ b/octave.spec @@ -21,9 +21,8 @@ Name: octave Epoch: 6 Version: 4.2.1 -Release: 4%{?rcver:.rc%{rcver}}%{?dist}.2 +Release: 4%{?rcver:.rc%{rcver}}%{?dist}.3 Summary: A high-level language for numerical computations -Group: Applications/Engineering License: GPLv3+ URL: http://www.octave.org @@ -154,6 +153,7 @@ Requires: tex(color.sty) Requires: tex(epsfig.sty) Requires: tex(geometry.sty) Requires: tex(graphicx.sty) +Requires: hicolor-icon-theme Requires(post): info Requires(preun): info @@ -201,9 +201,7 @@ BuildArch: noarch This package contains documentation for Octave. %prep -%setup -q -n %{name}-%{version}%{?rctag} -%patch2 -p1 -b .appdata -%patch4 -p1 -b .gnulib +%autosetup -p1 -n %{name}-%{version}%{?rctag} # __osmesa_print__ test is triggering a crash in libgcc, disable it # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=78409 #sed -i -e '/^%!/d' libinterp/dldfcn/__osmesa_print__.cc @@ -268,10 +266,10 @@ then exit 1 fi -make OCTAVE_RELEASE="Fedora %{version}%{?rctag}-%{release}" %{?_smp_mflags} +%make_build OCTAVE_RELEASE="Fedora %{version}%{?rctag}-%{release}" %install -make install DESTDIR=%{buildroot} +%make_install # Docs - In case we didn't build them and to explicitly install pre-built docs make install-data install-html install-info install-pdf DESTDIR=%{buildroot} @@ -448,6 +446,9 @@ fi %{_pkgdocdir}/refcard*.pdf %changelog +* Fri Sep 08 2017 Vasiliy N. Glazov - 6:4.2.1-4.3 +- Cleanup spec + * Sun Aug 12 2017 Orion Poplawski - 6:4.2.1-4.2 - Make octave-devel require libappstream-glib @@ -1439,4 +1440,4 @@ does not exist. - Upgraded to version 2.0.9 and built for glibc system * Thu May 01 1997 Michael Fulbright -- Updated to version 2.0.5 and changed to build using a BuildRoot +- Updated to version 2.0.5 and changed to build using a BuildRoot \ No newline at end of file From acac0a4a0f1c8cc13ce94b39256a0231064260ae Mon Sep 17 00:00:00 2001 From: vascom Date: Sep 08 2017 14:06:21 +0000 Subject: [PATCH 2/2] Added newline at end of file --- diff --git a/octave.spec b/octave.spec index cf592eb..ea34350 100644 --- a/octave.spec +++ b/octave.spec @@ -1440,4 +1440,4 @@ does not exist. - Upgraded to version 2.0.9 and built for glibc system * Thu May 01 1997 Michael Fulbright -- Updated to version 2.0.5 and changed to build using a BuildRoot \ No newline at end of file +- Updated to version 2.0.5 and changed to build using a BuildRoot