packages: libjpeg-turbo/libjpeg-turbo.spec, libjpeg-turbo/libjpeg-turbo-tur...
baggins
baggins at pld-linux.org
Wed Aug 31 21:13:32 CEST 2011
Author: baggins Date: Wed Aug 31 19:13:32 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 2
- instead of dropping turbojpeg make it versioned
---- Files affected:
packages/libjpeg-turbo:
libjpeg-turbo.spec (1.81 -> 1.82) , libjpeg-turbo-turbojpeg.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/libjpeg-turbo/libjpeg-turbo.spec
diff -u packages/libjpeg-turbo/libjpeg-turbo.spec:1.81 packages/libjpeg-turbo/libjpeg-turbo.spec:1.82
--- packages/libjpeg-turbo/libjpeg-turbo.spec:1.81 Sat May 28 11:47:57 2011
+++ packages/libjpeg-turbo/libjpeg-turbo.spec Wed Aug 31 21:13:27 2011
@@ -6,12 +6,13 @@
Summary(pl.UTF-8): Biblioteka do obróbki plików obrazów JPEG z akceleracją MMX/SSE2
Name: libjpeg-turbo
Version: 1.1.1
-Release: 1
+Release: 2
License: wxWidgets
Group: Libraries
Source0: http://downloads.sourceforge.net/libjpeg-turbo/%{name}-%{version}.tar.gz
# Source0-md5: 03b9c1406c7bfdc204313c2917ce6962
URL: http://libjpeg-turbo.virtualgl.org/
+Patch0: %{name}-turbojpeg.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libstdc++-devel
@@ -144,6 +145,7 @@
%prep
%setup -q
+%patch0 -p1
%build
%{__libtoolize}
@@ -166,11 +168,6 @@
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-# libturbojpeg is unversioned, so we drop it
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/jpgtest
-%{__rm} $RPM_BUILD_ROOT%{_includedir}/turbojpeg.h
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libturbojpeg.*
-
%clean
rm -rf $RPM_BUILD_ROOT
@@ -182,25 +179,32 @@
%doc README change.log
%attr(755,root,root) %{_libdir}/libjpeg.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libjpeg.so.8
+%attr(755,root,root) %{_libdir}/libturbojpeg.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libturbojpeg.so.0
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libjpeg.so
+%attr(755,root,root) %{_libdir}/libturbojpeg.so
%{_libdir}/libjpeg.la
+%{_libdir}/libturbojpeg.la
%{_includedir}/jconfig.h
%{_includedir}/jerror.h
%{_includedir}/jmorecfg.h
%{_includedir}/jpeglib.h
+%{_includedir}/turbojpeg.h
%files static
%defattr(644,root,root,755)
%{_libdir}/libjpeg.a
+%{_libdir}/libturbojpeg.a
%files progs
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/cjpeg
%attr(755,root,root) %{_bindir}/djpeg
%attr(755,root,root) %{_bindir}/jpegtran
+%attr(755,root,root) %{_bindir}/jpgtest
%attr(755,root,root) %{_bindir}/rdjpgcom
%attr(755,root,root) %{_bindir}/wrjpgcom
%{_mandir}/man1/cjpeg.1*
@@ -215,6 +219,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.82 2011/08/31 19:13:27 baggins
+- rel 2
+- instead of dropping turbojpeg make it versioned
+
Revision 1.81 2011/05/28 09:47:57 qboosh
- updated to 1.1.1
- pl for base
================================================================
Index: packages/libjpeg-turbo/libjpeg-turbo-turbojpeg.patch
diff -u /dev/null packages/libjpeg-turbo/libjpeg-turbo-turbojpeg.patch:1.1
--- /dev/null Wed Aug 31 21:13:32 2011
+++ packages/libjpeg-turbo/libjpeg-turbo-turbojpeg.patch Wed Aug 31 21:13:27 2011
@@ -0,0 +1,10 @@
+--- 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
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libjpeg-turbo/libjpeg-turbo.spec?r1=1.81&r2=1.82&f=u
More information about the pld-cvs-commit
mailing list