From 7179a7e49501937cff915c6ee4667fed7b593197 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Wed, 29 May 2013 08:58:24 +0200 Subject: [PATCH] - updated to 1.3.0 - removed obsolete turbojpeg patch --- libjpeg-turbo-turbojpeg.patch | 10 ---------- libjpeg-turbo.spec | 10 ++++------ 2 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 libjpeg-turbo-turbojpeg.patch diff --git a/libjpeg-turbo-turbojpeg.patch b/libjpeg-turbo-turbojpeg.patch deleted file mode 100644 index 4432e4c..0000000 --- a/libjpeg-turbo-turbojpeg.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- libjpeg-turbo-1.1.1/Makefile.am~ 2011-05-18 05:51:06.000000000 +0200 -+++ libjpeg-turbo-1.1.1/Makefile.am 2011-08-31 21:08:00.029223303 +0200 -@@ -1,6 +1,6 @@ - lib_LTLIBRARIES = libjpeg.la libturbojpeg.la - libjpeg_la_LDFLAGS = -version-info ${SO_MAJOR_VERSION}:${SO_MINOR_VERSION} -no-undefined --libturbojpeg_la_LDFLAGS = -avoid-version -no-undefined -+libturbojpeg_la_LDFLAGS = -no-undefined - include_HEADERS = jerror.h jmorecfg.h jpeglib.h turbojpeg.h - nodist_include_HEADERS = jconfig.h - diff --git a/libjpeg-turbo.spec b/libjpeg-turbo.spec index d02ce5a..38f13d7 100644 --- a/libjpeg-turbo.spec +++ b/libjpeg-turbo.spec @@ -8,13 +8,12 @@ Summary: A MMX/SSE2 accelerated library for manipulating JPEG image files Summary(pl.UTF-8): Biblioteka do obróbki plików obrazów JPEG z akceleracją MMX/SSE2 Name: libjpeg-turbo -Version: 1.2.1 -Release: 2 +Version: 1.3.0 +Release: 1 License: wxWidgets Group: Libraries Source0: http://downloads.sourceforge.net/libjpeg-turbo/%{name}-%{version}.tar.gz -# Source0-md5: f61e60ff01381ece4d2fe65eeb52669e -Patch0: %{name}-turbojpeg.patch +# Source0-md5: e1e65cc711a1ade1322c06ad4a647741 URL: http://libjpeg-turbo.virtualgl.org/ BuildRequires: autoconf >= 2.56 BuildRequires: automake @@ -168,7 +167,6 @@ Interfejs Javy do biblioteki TurboJPEG/OSS. %prep %setup -q -%patch0 -p1 %build %{__libtoolize} @@ -195,7 +193,7 @@ rm -rf $RPM_BUILD_ROOT %if %{with java} install -d $RPM_BUILD_ROOT%{_javadir} -%{__mv} $RPM_BUILD_ROOT%{_prefix}/classes/turbojpeg.jar $RPM_BUILD_ROOT%{_javadir} +%{__mv} $RPM_BUILD_ROOT%{_datadir}/classes/turbojpeg.jar $RPM_BUILD_ROOT%{_javadir} %endif %clean -- 2.44.0