[openjpeg] - Minor spec file changes according to the latest guidelines

Jaromír Cápík jcapik at fedoraproject.org
Thu Apr 17 11:28:21 UTC 2014


commit 8594f4bd176ad674ac61be11babad1851e70b426
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Thu Apr 17 13:28:04 2014 +0200

    - Minor spec file changes according to the latest guidelines

 openjpeg.spec |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/openjpeg.spec b/openjpeg.spec
index 9a54510..65ab00c 100644
--- a/openjpeg.spec
+++ b/openjpeg.spec
@@ -2,19 +2,18 @@
 # use cmake-buildsys, else autofoo
 # will probably rip this macro out soon, did so to help make
 # upstreamable patches -- Rex
-%define cmake_build 1
+%global cmake_build 1
 
 # enable conformance tests
-#define runcheck 1
+#global runcheck 1
 
 Name:    openjpeg
 Version: 1.5.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: JPEG 2000 command line tools
 
 License: BSD
-URL:     http://code.google.com/p/openjpeg/ 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL:     http://code.google.com/p/openjpeg/
 
 Source0: http://openjpeg.googlecode.com/files/openjpeg-%{version}.tar.gz
 %if 0%{?runcheck}
@@ -54,9 +53,9 @@ Patch204: openjpeg-1.5.1-CVE-2013-6887.patch
 
 
 %if 0%{?cmake_build}
-BuildRequires: cmake 
+BuildRequires: cmake
 %else
-BuildRequires: automake libtool 
+BuildRequires: automake libtool
 %endif
 BuildRequires: doxygen
 BuildRequires: libtiff-devel
@@ -144,8 +143,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
-
 %if 0%{?cmake_build}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 %else
@@ -181,7 +178,7 @@ make test -C %{_target_platform}
 %postun libs -p /sbin/ldconfig
 
 %files libs
-%doc CHANGES LICENSE 
+%doc CHANGES LICENSE
 %{_libdir}/libopenjpeg.so.1*
 %{_mandir}/man3/*libopenjpeg.3*
 
@@ -201,6 +198,9 @@ make test -C %{_target_platform}
 
 
 %changelog
+* Thu Apr 17 2014 Jaromir Capik <jcapik at redhat.com> - 1.5.1-9
+- Minor spec file changes according to the latest guidelines
+
 * Sat Jan 11 2014 Rex Dieter <rdieter at fedoraproject.org> 1.5.1-8
 - revert CVE-2013-6045 patch due to regression (#1047494)
 


More information about the scm-commits mailing list