rpms/openjpeg/devel .cvsignore, 1.4, 1.5 openjpeg.spec, 1.12, 1.13 sources, 1.4, 1.5
Rex Dieter
rdieter at fedoraproject.org
Wed Jul 7 13:51:34 UTC 2010
- Previous message: File nss-pam-ldapd-0.7.7.tar.gz.sig uploaded to lookaside cache by nalin
- Next message: rpms/WebCalendar/devel WebCalendar-1.2.0-daylightbug.patch, NONE, 1.1 WebCalendar-1.2.0-php53.patch, NONE, 1.1 WebCalendar-1.2.0-viewothers.patch, NONE, 1.1 WebCalendar-1.2.1-usercase.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 WebCalendar.spec, 1.2, 1.3 sources, 1.2, 1.3 WebCalendar-1.2.0-nolangwarn.patch, 1.1, NONE WebCalendar-1.2.0-shebang.patch, 1.1, NONE WebCalendar-1.2.0-usercase.patch, 1.1, NONE WebCalendar-1.2.0-weektimebar.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/openjpeg/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3477
Modified Files:
.cvsignore openjpeg.spec sources
Log Message:
* Wed Jul 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.3-9
- include test samples, enable tests
- tighten subpkg deps
- explicitly set/use -DBUILD_SHARED_LIBS:BOOL=ON
- move %doc files to -libs
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openjpeg/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 4 Jan 2008 08:18:37 -0000 1.4
+++ .cvsignore 7 Jul 2010 13:51:34 -0000 1.5
@@ -1 +1,2 @@
openjpeg_v1_3.tar.gz
+j2kp4files_v1_5.zip
Index: openjpeg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openjpeg/devel/openjpeg.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- openjpeg.spec 17 Feb 2010 18:22:35 -0000 1.12
+++ openjpeg.spec 7 Jul 2010 13:51:34 -0000 1.13
@@ -3,7 +3,7 @@
Name: openjpeg
Version: 1.3
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: JPEG 2000 command line tools
Group: Applications/Multimedia
@@ -11,11 +11,14 @@ License: BSD
URL: http://www.openjpeg.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://www.openjpeg.org/openjpeg_v1_3.tar.gz
+Source1: http://www.crc.ricoh.com/~gormish/jpeg2000conformance/j2kp4files_v1_5.zip
+
BuildRequires: cmake
BuildRequires: libtiff-devel
BuildRequires: recode
-Source0: http://www.openjpeg.org/openjpeg_v1_3.tar.gz
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Patch1: openjpeg-20070717svn-codec-libtiff.patch
Patch4: openjpeg-svn480-cmake.patch
@@ -42,24 +45,22 @@ developed in order to promote the use of
compression standard from the Joint Photographic Experts Group (JPEG).
%package libs
-Summary: JPEG 2000 codec library
+Summary: JPEG 2000 codec runtime library
Group: System Environment/Libraries
-
%description libs
-The openjpeg-libs package contains runtime libraries for applications that use
+The %{name}-libs package contains runtime libraries for applications that use
OpenJPEG.
%package devel
-Summary: Development files for openjpeg
+Summary: Development files for %{name}
Group: Development/Libraries
-Requires: openjpeg-libs = %{version}-%{release}
-
+Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%description devel
-The openjpeg-devel package contains libraries and header files for
+The %{name}-devel package contains libraries and header files for
developing applications that use OpenJPEG.
%prep
-%setup -q -n OpenJPEG_v1_3
+%setup -q -n OpenJPEG_v1_3 -a 1
# Windows stuff, delete it, it slows down patch making
rm -rf jp3d
# Make sure we use system libraries
@@ -86,18 +87,23 @@ find . -type f -print0 | xargs -0 chmod
# fix charset
recode latin1..utf8 ChangeLog
+
%build
-mkdir build
-pushd build
-%cmake .. -DBUILD_EXAMPLES:BOOL=ON
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%cmake \
+ -DBUILD_EXAMPLES:BOOL=ON \
+ -DBUILD_SHARED_LIBS:BOOL=ON \
+ -DJPEG2000_CONFORMANCE_DATA_ROOT:PATH=../J2KP4files/ \
+ ..
popd
-make %{?_smp_mflags} -C build
+make %{?_smp_mflags} -C %{_target_platform}
%install
rm -rf %{buildroot}
-make install/fast DESTDIR="%{buildroot}" -C build
+make install/fast DESTDIR="%{buildroot}" -C %{_target_platform}
# HACK: until pkg-config support lands, temporarily provide
# openjpeg.h header in legacy location
@@ -105,19 +111,23 @@ ln -s openjpeg/openjpeg.h %{buildroot}%{
%check
-# mostly pointless without test images, but it's a start -- Rex
-make test -C build
+## known failure (on rex's f13/x86_64 box anyway)
+#The following tests FAILED:
+# 24 - j2i-p0_07.j2k (SEGFAULT)
+make test -C %{_target_platform} ||:
+
%clean
rm -rf %{buildroot}
+
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
+
%files
%defattr(-,root,root,-)
-%doc ChangeLog license.txt
%{_bindir}/extract_j2k_from_mj2
%{_bindir}/frames_to_mj2
%{_bindir}/image_to_j2k
@@ -127,6 +137,7 @@ rm -rf %{buildroot}
%files libs
%defattr(-,root,root,-)
+%doc ChangeLog license.txt
%{_libdir}/libopenjpeg.so.2*
%files devel
@@ -135,7 +146,14 @@ rm -rf %{buildroot}
%{_includedir}/openjpeg/
%{_libdir}/libopenjpeg.so
+
%changelog
+* Wed Jul 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.3-9
+- include test samples, enable tests
+- tighten subpkg deps
+- explicitly set/use -DBUILD_SHARED_LIBS:BOOL=ON
+- move %%doc files to -libs
+
* Wed Feb 17 2010 Adam Goode <adam at spicenitz.org> - 1.3-8
- Fix typo in description
- Fix charset of ChangeLog (rpmlint)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openjpeg/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 4 Jan 2008 08:18:37 -0000 1.4
+++ sources 7 Jul 2010 13:51:34 -0000 1.5
@@ -1 +1,2 @@
f9a3ccfa91ac34b589e9bf7577ce8ff9 openjpeg_v1_3.tar.gz
+27780ed3254e6eb763ebd718a8ccc340 j2kp4files_v1_5.zip
- Previous message: File nss-pam-ldapd-0.7.7.tar.gz.sig uploaded to lookaside cache by nalin
- Next message: rpms/WebCalendar/devel WebCalendar-1.2.0-daylightbug.patch, NONE, 1.1 WebCalendar-1.2.0-php53.patch, NONE, 1.1 WebCalendar-1.2.0-viewothers.patch, NONE, 1.1 WebCalendar-1.2.1-usercase.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 WebCalendar.spec, 1.2, 1.3 sources, 1.2, 1.3 WebCalendar-1.2.0-nolangwarn.patch, 1.1, NONE WebCalendar-1.2.0-shebang.patch, 1.1, NONE WebCalendar-1.2.0-usercase.patch, 1.1, NONE WebCalendar-1.2.0-weektimebar.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list