Changeset 1719 for spec/trunk/SPECS

Timestamp:

Oct 17, 2020, 11:01:30 AM (5 years ago)

Author:

tellie

Message:

spec: jasper: Release version 2.0.22-1.

Location:

spec/trunk/SPECS

Files:

• LibRaw.spec (modified) (1 diff)
• dos2unix.spec (modified) (1 diff)
• jasper.spec (modified) (5 diffs)
• libopusenc.spec (modified) (1 diff)

spec/trunk/SPECS/LibRaw.spec

@@ -84 +84 @@
 %make_build
 %else
+make %{?_smp_mflags} 
 %endif
 

spec/trunk/SPECS/dos2unix.spec

@@ -21 +21 @@
 Convert text files with DOS or Mac line endings to Unix line endings and 
 vice versa.
+
+%debug_package
 
 %prep

spec/trunk/SPECS/jasper.spec

@@ -6 +6 @@
 Summary: Implementation of the JPEG-2000 standard, Part 1
 Name:    jasper
-Version: 2.0.14
-Release: 2%{?dist}
+Version: 2.0.22
+Release: 1%{?dist}
 
 License: JasPer
 URL:     http://www.ece.uvic.ca/~frodo/jasper/
-%scm_source github http://github.com/TeLLie/%{name}-os2 master-os2
+%if !0%{?os2_version}
+Source0: https://github.com/jasper-software/jasper/archive/version-%{version}.tar.gz
+%else
+%scm_source github http://github.com/TeLLie/%{name}-os2 %{version}-os2
+%endif
 
-#Patch1: jasper-2.0.14-CVE-2016-9396.patch
 # skip hard-coded prefix/lib rpath
-#Patch2: jasper-2.0.14-rpath.patch
+%if !0%{?os2_version}
+Patch2: jasper-2.0.14-rpath.patch
+Patch3: jasper-freeglut.patch
+
 # architecture related patches
 Patch100: jasper-2.0.2-test-ppc64-disable.patch
 Patch101: jasper-2.0.2-test-ppc64le-disable.patch
+%endif
 
 # autoreconf
 BuildRequires: cmake
-#BuildRequires: freeglut-devel 
-#BuildRequires: libGLU-devel
+%if !0%{?os2_version}
+BuildRequires: freeglut-devel 
+BuildRequires: libGLU-devel
+BuildRequires: libXmu-devel libXi-devel
+BuildRequires: mesa-libGL-devel
+%endif
 BuildRequires: libjpeg-devel
-#BuildRequires: libXmu-devel libXi-devel
 BuildRequires: pkgconfig doxygen
-#BuildRequires: mesa-libGL-devel
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -59 +68 @@
 %{summary}, including jiv and tmrdemo.
 
+%debug_package
 
 %prep
-#%setup -q -n %{name}-%{version}
+%if !0%{?os2_version}
+%setup -q -n %{name}-version-%{version}
+%else
 %scm_setup
+%endif
 
-#%patch1 -p1 -b .CVE-2016-9396
-#%patch2 -p1 -b .rpath
+%if !0%{?os2_version}
+%patch2 -p1 -b .rpath
 # Need to disable one test to be able to build it on ppc64 arch
 # At ppc64 this test just stuck (nothing happend - no exception or error)
+%patch3 -p1 -b .freeglut
+%endif
 
 %if "%{_arch}" == "ppc64"
@@ -80 +95 @@
 %endif
 
-
 %build
 mkdir builder
 cd builder
+
 export LDFLAGS="-Zhigh-mem -Zomf -Zargs-wild -Zargs-resp" 
 export LIBS="-lcx -lpthread"
-
-%cmake .. \
+%cmake  ..\
   -DJAS_ENABLE_DOC:BOOL=OFF
-#popd
-
-#%make_build -C builder
-make %{?_smp_mflags} 
+%if !0%{?os2_version}
+  -B builder
+%make_build -C builder
+%else
+make %{?_smp_mflags}
+%endif
 
 %install
@@ -101 +117 @@
 rm -f %{buildroot}%{_libdir}/lib*.la
 
-mkdir -p %{buildroot}%{_libdir}
-mv %{buildroot}%{_bindir}/jasper.dll  %{buildroot}%{_libdir}/jasper.dll
 
 %check
-#make test -C builder
+%if !0%{?os2_version}
+make test -C builder
 
-#%ldconfig_scriptlets libs
+%ldconfig_scriptlets libs
+%endif
 
 %files
-%defattr(-,root,root,-)
+%if !0%{?os2_version}
+%{_bindir}/imgcmp
+%{_bindir}/imginfo
+%{_bindir}/jasper
+%else
 %{_bindir}/imgcmp.exe
 %{_bindir}/imginfo.exe
 %{_bindir}/jasper.exe
+%endif
 %{_mandir}/man1/img*
 %{_mandir}/man1/jasper.1*
@@ -119 +140 @@
 
 %files devel
-/@unixroot/usr/lib/
-%defattr(-,root,root,-)
 %doc doc/*
 %{_includedir}/jasper/
-%{_libdir}/jasper*.a
+%if !0%{?os2_version}
+%{_libdir}/libjasper.so
+%else
+%{_libdir}/*.a
+%endif
 %{_libdir}/pkgconfig/jasper.pc
 
 %files libs
-%defattr(-,root,root,-)
 %doc README
 %license COPYRIGHT LICENSE
+%if !0%{?os2_version}
+%{_libdir}/libjasper.so.4*
+%else
 %{_libdir}/jasper*.dll
+%endif
 
-#%files utils
-#%{_bindir}/jiv.exe
-#%{_mandir}/man1/jiv.1*
+%if !0%{?os2_version}
+%files utils
+%{_bindir}/jiv
+%{_mandir}/man1/jiv.1*
+%endif
 
 %changelog
+* Sat Oct 17 2020 Elbert Pol <elbert.pol@gmail.com> - 2.0.22-1
+- Updated to latest version 2.0.22
+- Change more os2 specifated lines in spec file
+
 * Fri Dec 28 2018 Elbert Pol <elbert.pol@gmail.com>  - 2.0.14-2
 - Removed the dll from bindir

spec/trunk/SPECS/libopusenc.spec

@@ -1 +1 @@
 Name:     libopusenc
 Version:  0.2.1
-Release:  5%{?dist}
+Release:  1%{?dist}
 Summary:  A library that provides an easy way to encode Ogg Opus files
 License:  BSD