Hello community, here is the log from the commit of package openjpeg2 for openSUSE:Factory checked in at 2015-09-08 17:37:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openjpeg2 (Old) and /work/SRC/openSUSE:Factory/.openjpeg2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openjpeg2" Changes: -------- --- /work/SRC/openSUSE:Factory/openjpeg2/openjpeg2.changes 2014-06-16 21:43:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.openjpeg2.new/openjpeg2.changes 2015-09-08 17:38:22.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Sep 4 11:54:30 UTC 2015 - mpluskal@suse.com + +- Use cmake macro +- Remove baselibs.conf (it was broken anyways for months) +- Cleanup spec file with spec-cleaner + +------------------------------------------------------------------- Old: ---- baselibs.conf ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openjpeg2.spec ++++++ --- /var/tmp/diff_new_pack.0MH3sF/_old 2015-09-08 17:38:26.000000000 +0200 +++ /var/tmp/diff_new_pack.0MH3sF/_new 2015-09-08 17:38:26.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package openjpeg2 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,9 +17,8 @@ %define library_name libopenjp2-7 - -Name: openjpeg2 %define base_version 2.1 +Name: openjpeg2 Version: %{base_version}.0 Release: 0 Summary: Opensource JPEG 2000 Codec Implementation @@ -27,11 +26,9 @@ Group: Productivity/Graphics/Other Url: http://www.openjpeg.org/ Source0: http://sourceforge.net/projects/openjpeg.mirror/files/%{version}/openjpeg-%{version}.tar.gz -Source1: baselibs.conf BuildRequires: cmake > 2.8.2 BuildRequires: doxygen BuildRequires: fdupes -BuildRequires: gcc BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libtiff-4) @@ -79,11 +76,7 @@ done %build -export CFLAGS="%{optflags}" -export CXXFLAGS="%{optflags}" -mkdir build -cd build -cmake \ +%cmake \ -DBUILD_SHARED_LIBS:BOOL=ON \ -DBUILD_CODEC:BOOL=ON \ -DBUILD_JPIP:BOOL=OFF \ @@ -92,28 +85,23 @@ -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 %{?_smp_mflags} VERBOSE=1 -make %{?_smp_mflags} VERBOSE=1 doc + -DOPENJPEG_INSTALL_LIB_DIR:PATH="%{_lib}" +make %{?_smp_mflags} all doc cat << END > libopenjp2.pc + Name: openjpeg -Description: Opensource JPEG 2000 Codec Implementation -URL: %{url} Version: %{version} +Url: %{url} +Description: Opensource JPEG 2000 Codec Implementation Libs: -L%{_libdir} -lopenjp2 Libs.private: -lm Cflags: -I%{_includedir}/openjpeg-%{base_version} END - %fdupes -s doc/html/ %install -%make_install -C build +%cmake_install mkdir -p %{buildroot}%{_libdir}/pkgconfig/ install -m 644 build/libopenjp2.pc %{buildroot}%{_libdir}/pkgconfig/ rm -rf %{buildroot}%{_datadir}/doc