Hello community, here is the log from the commit of package liborigin for openSUSE:Factory checked in at 2018-03-09 10:42:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/liborigin (Old) and /work/SRC/openSUSE:Factory/.liborigin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "liborigin" Fri Mar 9 10:42:25 2018 rev:4 rq:582980 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/liborigin/liborigin.changes 2016-06-21 12:29:13.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.liborigin.new/liborigin.changes 2018-03-09 10:42:26.391659710 +0100 @@ -1,0 +2,13 @@ +Thu Feb 22 11:07:14 UTC 2018 - [email protected] + +- Fix SRPM group. + +------------------------------------------------------------------- +Tue Feb 6 09:57:31 UTC 2018 - [email protected] + +- Update to version 2.0.0 + * No changelog was provided + Drop liborigin-200080225-gcc.patch + Add liborigin2-nostatic.patch + +------------------------------------------------------------------- Old: ---- liborigin-200080225-gcc.patch liborigin-20080225.tar.gz New: ---- liborigin-2.0.0.tar.gz liborigin2-nostatic.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ liborigin.spec ++++++ --- /var/tmp/diff_new_pack.QyAnzT/_old 2018-03-09 10:42:27.707612318 +0100 +++ /var/tmp/diff_new_pack.QyAnzT/_new 2018-03-09 10:42:27.707612318 +0100 @@ -1,7 +1,7 @@ # # spec file for package liborigin # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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,14 +17,16 @@ Name: liborigin -Version: 20080225 +Version: 2.0.0 Release: 0 Summary: A library for reading OriginLab OPJ project files -License: GPL-2.0+ -Group: System/Libraries +License: GPL-2.0-or-later +Group: Development/Libraries/C and C++ Url: http://sourceforge.net/projects/liborigin/ Source: http://downloads.sourceforge.net/liborigin/%{name}-%{version}.tar.gz -Patch1: liborigin-200080225-gcc.patch +# PATCH-FIX-OPENSUSE liborigin2-nostatic.patch -- disable static library +Patch1: liborigin2-nostatic.patch +BuildRequires: boost-devel BuildRequires: cmake BuildRequires: gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -35,11 +37,11 @@ * reads any worksheets with all columns * supports 4.1, 5.0, 6.0, 6.1, 7.0, 7.5 projects -%package -n %{name}0 +%package -n %{name}2 Summary: A library for reading OriginLab OPJ project files Group: System/Libraries -%description -n %{name}0 +%description -n %{name}2 A library for reading OriginLab OPJ project files. Features: * reads any worksheets with all columns @@ -48,9 +50,8 @@ %package devel Summary: Libraries and header files for liborigin Group: Development/Libraries/C and C++ -Requires: %{name}0 = %{version} +Requires: %{name}2 = %{version} Recommends: %{name}-doc -Conflicts: liborigin2-devel %description devel This package contains libraries and header files for developing @@ -69,7 +70,6 @@ %package tools Summary: Converter for OriginLab OPJ project files Group: Productivity/Scientific/Other -Conflicts: liborigin2-tools %description tools Converter for OriginLab OPJ project files. @@ -78,36 +78,28 @@ * supports 4.1, 5.0, 6.0, 6.1, 7.0, 7.5 projects %prep -%setup -q +%setup -q -n %{name} %patch1 -p1 -%build # fix hardcoded library path sed -i "s|DESTINATION lib)|DESTINATION %{_lib})|" CMakeLists.txt -# force old c++ standard for GCC6 -%if 0%{?suse_version} > 1320 -export CXXFLAGS="-std=gnu++98 %{optflags}" -%endif +# fix documentation directory +sed -i "s|DESTINATION share/doc/liborigin)|DESTINATION %{_docdir}/%{name})|" CMakeLists.txt -cmake \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - . +%build +%cmake -make %{?_smp_mflags} VERBOSE=1 +make %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} - -# install headers -install -d %{buildroot}%{_includedir}/%{name}/ -install -m 644 OPJFile.h tree.hh %{buildroot}%{_includedir}/%{name}/ +%cmake_install -%post -n %{name}0 -p /sbin/ldconfig +%post -n %{name}2 -p /sbin/ldconfig -%postun -n %{name}0 -p /sbin/ldconfig +%postun -n %{name}2 -p /sbin/ldconfig -%files -n %{name}0 +%files -n %{name}2 %defattr(-,root,root) %{_libdir}/%{name}.so.* @@ -118,7 +110,7 @@ %files doc %defattr(-,root,root) -%doc COPYING FORMAT README +%{_docdir}/%{name}/ %files tools %defattr(-,root,root) ++++++ liborigin-20080225.tar.gz -> liborigin-2.0.0.tar.gz ++++++ ++++ 16802 lines of diff (skipped) ++++++ liborigin2-nostatic.patch ++++++ Index: liborigin/CMakeLists.txt =================================================================== --- liborigin.orig/CMakeLists.txt +++ liborigin/CMakeLists.txt @@ -42,19 +42,15 @@ set_target_properties(origin PROPERTIES VERSION ${LIBORIGIN_VERSION_MAJOR}.${LIBORIGIN_VERSION_MINOR}.${LIBORIGIN_VERSION_BUGFIX} SOVERSION ${LIBORIGIN_VERSION_MAJOR} ) -# static library -add_library (origin-static STATIC ${sources}) -set_target_properties(origin-static PROPERTIES OUTPUT_NAME "origin") - # install libraries -install(TARGETS origin origin-static DESTINATION lib) +install(TARGETS origin DESTINATION lib) # install headers install(FILES ${devel-headers} DESTINATION include/liborigin) # command line util add_executable(opj2dat opj2dat.cpp) -target_link_libraries (opj2dat origin-static) +target_link_libraries (opj2dat origin) install(TARGETS opj2dat DESTINATION bin)
