Changeset 850 for spec/trunk/SPECS/libjpeg.spec

Timestamp:

Sep 21, 2016, 9:27:20 PM (9 years ago)

Author:

Silvan Scherrer

Message:

spec: libjpeg: update to version 8d

File:

• spec/trunk/SPECS/libjpeg.spec (modified) (6 diffs)

spec/trunk/SPECS/libjpeg.spec

@@ +1 @@
+#define svn_url     e:/trees/libjpeg/trunk
+%define svn_url     http://svn.netlabs.org/repos/ports/libjpeg/trunk
+%define svn_rev     1707
+
 Summary: A library for manipulating JPEG image format files
 Name: libjpeg
-Version: 8c
+Version: 8d
 Release: 1%{?dist}
 License: IJG
@@ -7 +11 @@
 URL: http://www.ijg.org/
 
-Source0: ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v%{version}.tar.gz
+Vendor:  bww bitwise works GmbH
+Source:  %{name}-%{version}%{?svn_rev:-r%{svn_rev}}.zip
 
-Patch1: jpeg-os2.diff
+# DEF files to create forwarders for the legacy package
+Source10:       jpeg.def
 
-#BuildRequires: autoconf libtool
+BuildRequires: autoconf libtool
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -48 +54 @@
 necessary for some boot packages.
 
+%debug_package
+
 %prep
-%setup -q -n jpeg-%{version}
+%if %{?svn_rev:%(sh -c 'if test -f "%{_sourcedir}/%{name}-%{version}-r%{svn_rev}.zip" ; then echo 1 ; else echo 0 ; fi')}%{!?svn_rev):0}
+%setup -q
+%else
+%setup -n "%{name}-%{version}" -Tc
+svn export %{?svn_rev:-r %{svn_rev}} %{svn_url} . --force
+rm -f "%{_sourcedir}/%{name}-%{version}%{?svn_rev:-r%{svn_rev}}.zip"
+(cd .. && zip -SrX9 "%{_sourcedir}/%{name}-%{version}%{?svn_rev:-r%{svn_rev}}.zip" "%{name}-%{version}")
+%endif
 
-%patch1 -p1 -b .os2~
+# Prepare forwarder DLLs.
+for m in %{SOURCE10}; do
+  cp ${m} .
+done
+
+# Hack: disable autoheader so that it doesn't overwrite our cfg template.
+export AUTOHEADER="echo autoheader ignored"
+autoreconf -vif
 
 %build
-export CONFIG_SHELL="/@unixroot/usr/bin/sh.exe"
-export CFLAGS="$RPM_OPT_FLAGS"
 export LDFLAGS="-Zhigh-mem -Zomf -Zargs-wild -Zargs-resp"
 %configure \
-     --disable-shared --enable-static \
-    "--cache-file=%{_topdir}/cache/%{name}-%{_target_cpu}.cache"
+     --enable-shared --enable-static
 
 make %{?_smp_mflags}
 
+%check
+# this export is needed, as else the dll for the tests are not found
+export BEGINLIBPATH=%{_builddir}/%{buildsubdir}/.libs
+make test
+
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %makeinstall
 
-install -m 755 jpeg.dll $RPM_BUILD_ROOT/%{_libdir}
-install -m 755 .libs/jpeg_s.a $RPM_BUILD_ROOT/%{_libdir}
+#install -m 755 jpeg.dll $RPM_BUILD_ROOT/%{_libdir}
+#install -m 755 .libs/jpeg_s.a $RPM_BUILD_ROOT/%{_libdir}
 
 # We don't ship .la files.
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
+
+# Generate & install forwarder DLLs.
+gcc -Zomf -Zdll jpeg.def -l$RPM_BUILD_ROOT/%{_libdir}/jpeg8.dll -o $RPM_BUILD_ROOT/%{_libdir}/jpeg.dll
 
 %files
@@ -78 +104 @@
 %doc usage.txt README
 %{_libdir}/jpeg*.dll
-%{_bindir}/*
+%{_bindir}/*.exe
 %{_mandir}/*/*
 
@@ -84 +110 @@
 %defattr(-,root,root)
 %doc libjpeg.txt coderules.txt structure.txt wizard.txt example.c
-%{_libdir}/jpeg.a
+%{_libdir}/jpeg*_dll.a
 %{_includedir}/*.h
 
 %files static
 %defattr(-,root,root)
-%{_libdir}/jpeg_s.a
+%{_libdir}/jpeg.a
 
 %clean
@@ -95 +121 @@
 
 %changelog
+* Wed Sep 21 2016 Silvan Scherrer <silvan.scherrer@aroa.ch> - 8d-1
+- update to version 8d
+- change build part
+- add debug files
+
 * Mon Dec 19 2011 yd
 - initial build.