From 871536dd4c521b146b8ee74b9629cf819ba8cbcc Mon Sep 17 00:00:00 2001 From: Alexander Ploumistos Date: Nov 18 2018 21:54:57 +0000 Subject: First v3.0.0 release Remove obsolete code from spec file Clean up the changelog Use epoch to provide an upgrade path from the old version --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..47719ff --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/liborigin-3.0.0.tar.gz diff --git a/liborigin-20080225-cxx11.patch b/liborigin-20080225-cxx11.patch deleted file mode 100644 index 35a3c04..0000000 --- a/liborigin-20080225-cxx11.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- liborigin-20080225/OPJFile.h.orig 2016-02-20 11:16:18.715237121 +0000 -+++ liborigin-20080225/OPJFile.h 2016-02-20 11:16:20.880244480 +0000 -@@ -764,7 +764,7 @@ - vector SPREADSHEET; - vector MATRIX; - vector EXCEL; -- vector FUNCTION; -+ vector <::function> FUNCTION; - vector GRAPH; - vector NOTE; - tree projectTree; ---- liborigin-20080225/OPJFile.cpp.orig 2016-02-20 11:17:21.955452074 +0000 -+++ liborigin-20080225/OPJFile.cpp 2016-02-20 11:17:29.268476931 +0000 -@@ -924,7 +924,7 @@ - break; - case 0x10C8: - fprintf(debug,"NEW FUNCTION\n"); -- FUNCTION.push_back(function(sname, dataIndex)); -+ FUNCTION.push_back(::function(sname, dataIndex)); - dataIndex++; - - char *cmd; diff --git a/liborigin-20080225-gcc.patch b/liborigin-20080225-gcc.patch deleted file mode 100644 index 379d5ce..0000000 --- a/liborigin-20080225-gcc.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur liborigin-20080225.orig/tree.hh liborigin-20080225/tree.hh ---- liborigin-20080225.orig/tree.hh 2008-02-25 11:19:47.000000000 +0100 -+++ liborigin-20080225/tree.hh 2011-07-01 13:32:16.702486023 +0200 -@@ -61,6 +61,7 @@ - #define tree_hh_ - - #include -+#include - #include - #include - #include diff --git a/liborigin.spec b/liborigin.spec index d64c1fc..cd68284 100644 --- a/liborigin.spec +++ b/liborigin.spec @@ -1,168 +1,77 @@ -Name: liborigin -Version: 20080225 -Release: 25%{?dist} -Summary: Library for reading OriginLab OPJ project files +Name: liborigin +Version: 3.0.0 +Release: 1%{?dist} +Epoch: 1 +Summary: Library for reading OriginLab OPJ project files -License: GPLv2 -Group: Development/Libraries -URL: http://sourceforge.net/projects/%{name}/ +License: GPLv3 +URL: https://sourceforge.net/projects/liborigin/ +Source0: https://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Source: http://master.dl.sourceforge.net/project/liborigin/liborigin/2008/%{name}-%{version}.tar.gz -# Include into tree.hh -Patch0: %{name}-%{version}-gcc.patch -Patch1: %{name}-%{version}-cxx11.patch +# No longer required +#BuildRequires: boost-devel +BuildRequires: gcc-c++ +BuildRequires: cmake +BuildRequires: doxygen -BuildRequires: gcc-c++ -BuildRequires: cmake +Provides: liborigin2 = 2.0.0-21 +Obsoletes: liborigin2 < 2.0.0-21 %description A library for reading OriginLab OPJ project files. -%package devel -Summary: Header files, libraries and development documentation for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +Provides: liborigin2-devel = 2.0.0-21 +Obsoletes: liborigin2-devel < 2.0.0-21 -%description devel -This package contains the header files, static libraries and development -documentation for %{name}. If you like to develop programs using %{name}, -you will need to install %{name}-devel. +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. -%prep -%setup -q -%patch0 -p1 -%patch1 -p1 +%package doc +Summary: Documentation for %{name} +BuildArch: noarch -%build +%description doc +The %{name}-doc package contains documentation for %{name}. -# fix for hardcoded path of %%{_libdir} -sed -i "s|install(TARGETS origin DESTINATION lib)|install(TARGETS origin DESTINATION %{_lib})|" CMakeLists.txt +%prep +%setup -q -n %{name}-%{version} +%build %cmake - -make VERBOSE=1 %{?_smp_mflags} +make doc +make %install -make INSTALL="install -p" DESTDIR=%{buildroot} install - -install -d %{buildroot}%{_includedir}/%{name}/ -install -pm 644 OPJFile.h tree.hh %{buildroot}%{_includedir}/%{name}/ - -#W: spurious-executable-perm -chmod 0644 ws4.opj - +%make_install +find %{buildroot} -name '*.la' -exec rm -f {} ';' %ldconfig_scriptlets - %files -%doc COPYING README ws4.opj import.qs +%doc README +%license COPYING +%{_libdir}/* %{_bindir}/opj2dat -%{_libdir}/%{name}.so.0* +%exclude %{_docdir}/%{name}/html +# We have license in different location and FORMAT in -doc +%exclude %{_docdir}/%{name}/COPYING +%exclude %{_docdir}/%{name}/FORMAT %files devel %{_includedir}/%{name}/ -%{_libdir}/%{name}.so - -%changelog -* Fri Jul 13 2018 Fedora Release Engineering - 20080225-25 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Jun 28 2018 Alexander Ploumistos - 20080225-24 -- Replace obsolete ldconfig scriptlets with macro and remove dependencies - -* Fri Feb 16 2018 Alexander Ploumistos - 20080225-23 -- Add gcc-c++ build dependency -- Fix rpmlint warning - -* Wed Feb 07 2018 Fedora Release Engineering - 20080225-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 20080225-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 20080225-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Mon May 15 2017 Fedora Release Engineering - 20080225-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 20080225-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Feb 15 2016 Jonathan Wakely - 20080225-17 -- Patched for C++11 compatibility - -* Thu Feb 04 2016 Fedora Release Engineering - 20080225-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 20080225-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild -* Mon May 11 2015 Nils Philippsen 2008525-14 -- remove bad conditional, use %%_lib instead of testing %%__isa_bits +%files doc +%doc FORMAT README +%license COPYING +%{_docdir}/%{name}/html/ -* Sun Aug 17 2014 Fedora Release Engineering - 20080225-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Wed Jun 25 2014 Peter Robinson 20080225-12 -- Generic 64 arch detection -- cleanup spec - -* Sat Jun 07 2014 Fedora Release Engineering - 20080225-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sat Aug 03 2013 Fedora Release Engineering - 20080225-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 20080225-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 20080225-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jan 13 2012 Fedora Release Engineering - 20080225-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Jul 04 2011 Ralf Corsépius - 20080225-6 -- Add liborigin-20080225-gcc.patch (Fix FTBFS BZ#716189). - -* Tue Feb 08 2011 Fedora Release Engineering - 20080225-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Jul 24 2009 Fedora Release Engineering - 20080225-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu May 21 2009 Dan Horak - 20080225-3 -- add s390x as 64-bit arch - -* Wed Feb 25 2009 Fedora Release Engineering - 20080225-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Tue Jun 10 2008 Chitlesh Goorah - 20080225-1 -- New upstream release 20080225 - -* Sat Apr 26 2008 Thibault North - 20070119-3 -- now uses again version 20070119 -- patch for successful rebuild with gcc4.3 - -* Mon Apr 21 2008 Thibault North - 20070115-2 -- rebuild for F9 with optimized gcc4.3 extensions - -* Fri Jan 18 2008 Chitlesh Goorah - 20071119-1 -- New upstream release -- fix for hardcoded path of %%{_libdir} -- opted cmake during the build process - -* Thu Aug 23 2007 Chitlesh Goorah - 20070115-4 -- queued for mass rebuild for Fedora 8 - BuildID - -* Tue Jan 30 2007 Chitlesh Goorah - 20070115-3 -- Fix directory ownership for -devel package - -* Sat Jan 27 2007 Chitlesh Goorah - 20070115-2 -- Added fix for hardcoded path of %%{_libdir} -- Added $$RPM_OPT_FLAGS to Makefile.LINUX - -* Sat Jan 20 2007 Chitlesh Goorah - 20070115-1 -- Initial package +%changelog +* Sun Nov 18 2018 Alexander Ploumistos - 1:3.0.0-1 +- First v3.0.0 release +- Remove obsolete code from spec file +- Clean up the changelog +- Use epoch to provide an upgrade path from the old version diff --git a/sources b/sources index dd7bed2..df8a5c7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5b7c6f22173a9d97c4f0dbec8671ac83 liborigin-20080225.tar.gz +SHA512 (liborigin-3.0.0.tar.gz) = 1cf00ec33a90b4baede0cd3b2a3e6d78ca4810511c6be58c4d1cce12e7e1001752422fe2ddbca80cd9016b91c5321eca1ab43606ace3acc21955a034ebc4094c