commit fc2e7f66e7ceb7553718d9f7df9406eabad31f52
Author: Jakub Bogusz <[email protected]>
Date: Tue Jan 24 21:04:34 2017 +0100
- updated to 2.0.10 (buildsystem switched to cmake; -static is gone)
- dropped pc patch
jasper-pc.patch | 8 --------
jasper.spec | 56 +++++++++++++++++++-------------------------------------
2 files changed, 19 insertions(+), 45 deletions(-)
---
diff --git a/jasper.spec b/jasper.spec
index d0b868b..1881cd3 100644
--- a/jasper.spec
+++ b/jasper.spec
@@ -5,21 +5,21 @@
Summary: JasPer - collection of software for coding and manipulation of
images
Summary(pl.UTF-8): JasPer - zestaw oprogramowania do obróbki obrazków
Name: jasper
-Version: 1.900.29
+Version: 2.0.10
Release: 1
Epoch: 0
License: BSD-like
Group: Libraries
#Source0Download: http://www.ece.uvic.ca/~frodo/jasper/#download
Source0:
http://www.ece.uvic.ca/~frodo/jasper/software/%{name}-%{version}.tar.gz
-# Source0-md5: 4619ec9860c10e557b3f192f5e76f596
-Patch0: %{name}-pc.patch
+# Source0-md5: 06882adcf92524eb493f3cf0d3f62c9a
URL: http://www.ece.uvic.ca/~frodo/jasper/
%{?with_opengl:BuildRequires: OpenGL-glut-devel}
-BuildRequires: autoconf >= 2.59-9
-BuildRequires: automake
+BuildRequires: cmake >= 2.8.11
+BuildRequires: doxygen
+BuildRequires: gcc >= 6:4.7
BuildRequires: libjpeg-devel
-BuildRequires: libtool
+BuildRequires: texlive-format-pdflatex
BuildRequires: unzip
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -54,6 +54,7 @@ Summary(pl.UTF-8): JasPer - pliki nagłówkowe
Group: Development/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: libjpeg-devel
+Obsoletes: jasper-static
%description devel
Header files needed to compile programs with libjasper.
@@ -61,18 +62,6 @@ Header files needed to compile programs with libjasper.
%description devel -l pl.UTF-8
Pliki nagłówkowe potrzebne do konsolidacji z libjasper.
-%package static
-Summary: JasPer - static library
-Summary(pl.UTF-8): JasPer - biblioteka statyczna
-Group: Development/Libraries
-Requires: %{name}-devel = %{epoch}:%{version}-%{release}
-
-%description static
-Static version of libjasper.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka libjasper.
-
%package jiv
Summary: JasPer Image Viewer
Summary(pl.UTF-8): Przeglądarka obrazków JasPer
@@ -101,30 +90,27 @@ kolorów powinna jednak wystarczyć.
%prep
%setup -q
-%patch0 -p1
%build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- %{!?with_opengl:--disable-opengl} \
- --enable-shared
+# there is upstream directory named "build", use different name
+install -d builddir
+cd builddir
+# note: build/jasper.pc.in expects CMAKE_INSTALL_INCLUDEDIR and
CMAKE_INSTALL_LIBDIR relative to CMAKE_INSTALL_PREFIX
+%cmake .. \
+ -DCMAKE_INSTALL_INCLUDEDIR:PATH=include \
+ -DCMAKE_INSTALL_LIBDIR:PATH=%{_lib} \
+ -DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=FALSE
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
+%{__make} -C builddir install \
DESTDIR=$RPM_BUILD_ROOT
-# obsoleted by pkg-config
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libjasper.la
-# nothing interesting
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/tmrdemo
+# PDFs packaged as %doc, HTML redundant
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/{html,*.pdf,README}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -134,7 +120,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc LICENSE NEWS README doc/jasper.pdf doc/jpeg2000.pdf
+%doc ChangeLog LICENSE README doc/jasper.pdf doc/jpeg2000.pdf
%attr(755,root,root) %{_bindir}/img*
%attr(755,root,root) %{_bindir}/jasper
%{_mandir}/man1/img*.1*
@@ -151,10 +137,6 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/jasper
%{_pkgconfigdir}/jasper.pc
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libjasper.a
-
%if %{with opengl}
%files jiv
%defattr(644,root,root,755)
diff --git a/jasper-pc.patch b/jasper-pc.patch
deleted file mode 100644
index 4561624..0000000
--- a/jasper-pc.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- jasper-1.900.29/pkgconfig/jasper.pc.in.orig 2016-11-16
16:03:40.000000000 +0100
-+++ jasper-1.900.29/pkgconfig/jasper.pc.in 2017-01-22 11:59:28.134104956
+0100
-@@ -8,4 +8,5 @@
- Version: @VERSION@
-
- Libs: -L${libdir} -ljasper
-+Libs.private: -ljpeg -lm
- Cflags: -I${includedir}/jasper
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/jasper.git/commitdiff/fc2e7f66e7ceb7553718d9f7df9406eabad31f52
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
