diff --git a/jasper.spec b/jasper.spec index f59a8f0..d32910b 100644 --- a/jasper.spec +++ b/jasper.spec @@ -5,19 +5,12 @@ Summary: Implementation of the JPEG-2000 standard, Part 1 Name: jasper -Group: System Environment/Libraries Version: 2.0.14 -Release: 2%{?dist} - -%if "%{version}" > "1.900.1" -%define ext .tar.gz -%else -%define ext .zip -%endif +Release: 3%{?dist} License: JasPer URL: http://www.ece.uvic.ca/~frodo/jasper/ -Source0: http://www.ece.uvic.ca/~frodo/jasper/software/jasper-%{version}%{ext} +Source0: http://www.ece.uvic.ca/~frodo/jasper/software/jasper-%{version}.tar.gz # architecture related patches @@ -34,6 +27,7 @@ BuildRequires: pkgconfig doxygen BuildRequires: mesa-libGL-devel Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: gcc %description This package contains an implementation of the image compression @@ -42,7 +36,6 @@ from the JP2 and JPC formats. %package devel Summary: Header files, libraries and developer documentation -Group: Development/Libraries Provides: libjasper-devel = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} Requires: libjpeg-devel @@ -52,14 +45,12 @@ Requires: pkgconfig %package libs Summary: Runtime libraries for %{name} -Group: System Environment/Libraries Conflicts: jasper < 1.900.1-4 %description libs %{summary}. %package utils Summary: Nonessential utilities for %{name} -Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description utils @@ -99,7 +90,7 @@ popd %install pushd builder -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=%{buildroot} #%if "%{_arch}" != "arm" && "%{_arch}" != "i386" # mv %{buildroot}/usr/lib %{buildroot}/usr/lib64 @@ -107,7 +98,7 @@ make install DESTDIR=$RPM_BUILD_ROOT # Unpackaged files rm -f doc/README -rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la +rm -f %{buildroot}%{_libdir}/lib*.la popd %check @@ -116,9 +107,7 @@ make test popd -%post libs -p /sbin/ldconfig - -%postun libs -p /sbin/ldconfig +%ldconfig_scriptlets libs %files @@ -145,6 +134,12 @@ popd %changelog +* Mon Feb 26 2018 Josef Ridky - 2.0.14-3 +- Clean spec file +- Remove unused Group tag +- Add gcc requirement +- Use ldconfig scriptlet + * Wed Feb 07 2018 Fedora Release Engineering - 2.0.14-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild