Accepting request 206659 from home:gberh:branches:graphics

cleanup in response to https://build.opensuse.org/request/show/206437, please resubmit to Factory OBS-URL: https://build.opensuse.org/request/show/206659 OBS-URL: https://build.opensuse.org/package/show/graphics/openjpeg2?expand=0&rev=5
2013-11-12 20:38:35 +00:00 · 2013-11-12 20:38:35 +00:00 · 3c7eee7650
commit 3c7eee7650
parent c7ca948920
3 changed files with 102 additions and 65 deletions
--- a/baselibs.conf
+++ b/baselibs.conf
@ -0,0 +1,5 @@
+libopenjp2-6
+openjpeg-devel
+    requires -openjpeg2-<targettype>
+    requires "libopenjp2-6-<targettype> = <version>"
+
--- a/openjpeg2.changes
+++ b/openjpeg2.changes
@ -1,8 +1,23 @@
+-------------------------------------------------------------------
+Tue Nov 12 14:06:55 UTC 2013 - gber@opensuse.org
+
+- cleanup
+  - improve group, summary, description
+  - fix license
+  - fix build dependencies
+  - use optflags, don't mess with debug symbols
+  - fix library install path
+  - create main package containing codec tools
+  - build doxygen documentaion
+  - fix %post/un scriptlets for the libopenjp2-6 subpackage
+  - add baselibs
+
 -------------------------------------------------------------------
 Wed May  8 11:56:09 UTC 2013 - behrisch@users.sourceforge.net

 - fixed make install for non suse targets

+-------------------------------------------------------------------
 Sun Nov 25 14:55:50 UTC 2012 - Angelos Tzotsos <tzotsos@opensuse.org>

 Update to version 2.0 Final, fixed some major issues :
--- a/openjpeg2.spec
+++ b/openjpeg2.spec
@ -1,109 +1,126 @@
 #
 # spec file for package openjpeg2
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
 # upon. The license for this file, and modifications and additions to the
 # file, is the same license as for the pristine package itself (unless the
-# license for the openjpeg package is not an Open Source License, in which
+# license for the pristine package is not an Open Source License, in which
 # case the license is the MIT License). An "Open Source License" is a
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.

 # Please submit bugfixes or comments via http://bugs.opensuse.org/
-
-# norootforbuild
-
-Name:           openjpeg2
-Version:        2.0.0
-Release:        1
-Summary:        The OpenJPEG library is an open-source JPEG 2000 library
-Group:          Development/Libraries/Other
-License:        BSD
-URL:            http://www.openjpeg.org/
-Source0:        openjpeg-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
-BuildRequires:  cmake 
-BuildRequires:  libgeotiff-devel 
-BuildRequires:  gcc-c++ 
-BuildRequires:  gcc 
-BuildRequires:  libpng-devel
-BuildRequires:  fdupes
-BuildRequires:  liblcms2-devel
-
-%description
-The main part of the project consists in a JPEG 2000 codec compliant with the Part 1 of the standard (Class-1 Profile-1 compliance)
+#

 %define library_name  libopenjp2-6

-%package -n libopenjp2-6
-Group:     Development/Libraries/Other
-Summary:   The OpenJPEG library is an open-source JPEG 2000 library
-License:   BSD
-Provides:  %{name} = %{version}
-%description -n libopenjp2-6
-The main part of the project consists in a JPEG 2000 codec compliant with the Part 1 of the standard (Class-1 Profile-1 compliance)
+Name:           openjpeg2
+Version:        2.0.0
+Release:        0
+Summary:        Opensource JPEG 2000 Codec Implementation
+License:        BSD-2-Clause
+Group:          Productivity/Graphics/Other
+Url:            http://www.openjpeg.org/
+Source0:        openjpeg-%{version}.tar.gz
+Source1:        baselibs.conf
+BuildRequires:  cmake
+BuildRequires:  fdupes
+BuildRequires:  gcc
+BuildRequires:  libgeotiff-devel
+BuildRequires:  liblcms2-devel
+BuildRequires:  libpng-devel
+BuildRequires:  doxygen
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%description
+The OpenJPEG library is an open-source JPEG 2000 codec written in C language.
+It has been developed in order to promote the use of JPEG 2000, the new
+still-image compression standard from the Joint Photographic Experts Group
+(JPEG).
+
+This package provides the codec executables.
+
+%package -n %{library_name}
+Summary:        Opensource JPEG 2000 Codec Implementation
+Group:          System/Libraries
+
+%description -n %{library_name}
+The OpenJPEG library is an open-source JPEG 2000 codec written in C language.
+It has been developed in order to promote the use of JPEG 2000, the new
+still-image compression standard from the Joint Photographic Experts Group
+(JPEG).

 %package        devel
 Summary:        Development files for %{name}
 Group:          Development/Libraries/Other
+Requires:       %{library_name} = %{version}
 Requires:       %{name} = %{version}
-Provides:	%{name}-devel = %{version}

 %description    devel
-Development files for the %{name} library. The main part of the project consists in a JPEG 2000 codec compliant with the Part 1 of the standard (Class-1 Profile-1 compliance)
+The OpenJPEG library is an open-source JPEG 2000 codec written in C language.
+It has been developed in order to promote the use of JPEG 2000, the new
+still-image compression standard from the Joint Photographic Experts Group
+(JPEG).

+This package provides the development files for %{name}.

 %prep
 %setup -q -n openjpeg-%{version}
+# do not embed timestamps into html documentation
+sed -i 's|^HTML_TIMESTAMP[ =].*$|HTML_TIMESTAMP = NO|' doc/Doxyfile.dox.cmake.in

 %build
-cd ..
-mkdir temp
-cd temp
-cmake  -DBUILD_SHARED_LIBS:BOOL=ON \
-       -DBUILD_CODEC:BOOL=ON \
-       -DBUILD_JPIP:BOOL=OFF \
-       -DBUILD_JPWL:BOOL=OFF \
-       -DBUILD_MJ2:BOOL=OFF \
-       -DBUILD_TESTING:BOOL=OFF \
-       -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-       -DCMAKE_INSTALL_LIB_DIR=%{_libdir} \
-       -DCMAKE_BUILD_TYPE:STRING="Release" ../openjpeg-%{version}/
+export CFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
+mkdir build
+cd build
+cmake \
+    -DBUILD_SHARED_LIBS:BOOL=ON \
+    -DBUILD_CODEC:BOOL=ON \
+    -DBUILD_JPIP:BOOL=OFF \
+    -DBUILD_JPWL:BOOL=OFF \
+    -DBUILD_MJ2:BOOL=OFF \
+    -DBUILD_TESTING:BOOL=OFF \
+    -DBUILD_DOC:BOOL=ON \
+    -DBUILD_THIRDPARTY:BOOL=OFF \
+    -DCMAKE_INSTALL_PREFIX:PATH="%{_prefix}" \
+    -DOPENJPEG_INSTALL_LIB_DIR:PATH="%{_lib}" \
+    -DCMAKE_BUILD_TYPE:STRING="Release" \
+    ..

-make VERBOSE=1 %{?_smp_mflags}
+make %{?_smp_mflags} VERBOSE=1
+make %{?_smp_mflags} VERBOSE=1 doc
+
+%fdupes -s doc/html/

 %install
-cd ../temp
-make DESTDIR=%{buildroot} install
-rm -rf %{buildroot}/usr/lib/debug
-%if "%{_lib}" == "lib64"
-mkdir %{buildroot}/usr/lib64
-mv %{buildroot}/usr/lib/* %{buildroot}/usr/lib64/
-%endif
-%fdupes %{buildroot}
+%make_install -C build

-%clean
-rm -rf %{buildroot}
+rm -rf %{buildroot}%{_datadir}/doc

-%post -p /sbin/ldconfig
+%post -n %{library_name} -p /sbin/ldconfig

-%postun -p /sbin/ldconfig
+%postun -n %{library_name} -p /sbin/ldconfig

-%files -n libopenjp2-6
+%files
 %defattr(-,root,root,-)
-%{_bindir}/*
-%{_libdir}/lib*.so.*
-%{_mandir}/*
-%{_datadir}/*
+%doc AUTHORS CHANGES NEWS LICENSE README THANKS
+%{_bindir}/opj_*
+%{_mandir}/man1/opj_*.1%{ext_man}
+
+%files -n %{library_name}
+%defattr(-,root,root,-)
+%{_libdir}/libopenjp2.so.*

 %files devel
 %defattr(-,root,root,-)
+%doc build/doc/html/
 %{_includedir}/openjpeg-2.0/
-%{_libdir}/lib*.so
+%{_libdir}/libopenjp2.so
 %{_libdir}/openjpeg-2.0/
+%{_mandir}/man3/libopenjp2.3%{ext_man}

 %changelog