From c37e41ce04cf11e772aa8f41da62ae474b2e650d68e99c623cce2dec68b401cc Mon Sep 17 00:00:00 2001 From: Adam Majer Date: Fri, 15 Mar 2019 10:32:53 +0000 Subject: [PATCH] Accepting request 685266 from home:Vogtinator:branches:home:jengelh:branches:devel:libraries:c_c++ - Add patch to fix build (gh#rttrorg/rttr#224): * skip_json_example.patch - Clean spec a bit - Fix RPM groups, trim filler wording from descriptions. OBS-URL: https://build.opensuse.org/request/show/685266 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/rttr?expand=0&rev=2 --- rttr.changes | 12 +++++++ rttr.spec | 78 +++++++++++++++++++---------------------- skip_json_example.patch | 10 ++++++ 3 files changed, 58 insertions(+), 42 deletions(-) create mode 100644 skip_json_example.patch diff --git a/rttr.changes b/rttr.changes index b169ba1..51efc69 100644 --- a/rttr.changes +++ b/rttr.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Mar 15 07:58:36 UTC 2019 - Fabian Vogt + +- Add patch to fix build (gh#rttrorg/rttr#224): + * skip_json_example.patch +- Clean spec a bit + +------------------------------------------------------------------- +Wed Jan 16 11:22:54 UTC 2019 - Jan Engelhardt + +- Fix RPM groups, trim filler wording from descriptions. + ------------------------------------------------------------------- Thu Jun 21 22:43:53 UTC 2018 - dan.weatherill@cantab.net diff --git a/rttr.spec b/rttr.spec index 4b20d00..7feff0b 100644 --- a/rttr.spec +++ b/rttr.spec @@ -1,7 +1,7 @@ # # spec file for package rttr # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -12,17 +12,17 @@ # 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/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: rttr Version: 0.9.6 Release: 0 -Summary: An open source library, which adds reflection to C++ +Summary: Run Time Type Reflection for C++ License: MIT -Url: http://www.rttr.org/releases/rttr-%{version}-src.tar.gz Group: Development/Languages/C and C++ +URL: http://www.rttr.org/releases/rttr-%{version}-src.tar.gz Source0: %{name}-%{version}-src.tar.gz #PATCH-FIX-OPENSUSE cxx11_compiler_flags.patch force c++11 mode on gcc4.8 (for Leap 42.3) Patch0: cxx11_compiler_flags.patch @@ -30,18 +30,17 @@ Patch0: cxx11_compiler_flags.patch Patch1: cmake_install_dir.patch #PATCH-FIX-OPENSUSE doxygen_remove_date_time.patch remove date and time information from generated documentation Patch2: doxygen_remove_date_time.patch +#PATCH-FIX-OPENSUSE skip_json_example.patch fix compile error (https://github.com/rttrorg/rttr/issues/224) +Patch3: skip_json_example.patch BuildRequires: cmake -BuildRequires: gcc-c++ -BuildRequires: doxygen BuildRequires: dos2unix -BuildRoot: %{_tmppath}/%{name}-%{version}-build - +BuildRequires: doxygen +BuildRequires: gcc-c++ %description -RTTR stands for Run Time Type Reflection. It describes the ability of a computer program to introspect and modify an object at runtime. It is also the name of the library itself, which is written in C++ and released as open source library. - -The goal of this project is to provide an easy and intuitive way to use reflection in C++. - +Run Time Type Reflection is the the ability of a computer program to +introspect and modify objects at runtime. It is also the name of the +library itself, which is written in C++. %prep %setup -q -n%{name}-%{version} @@ -50,8 +49,11 @@ The goal of this project is to provide an easy and intuitive way to use reflecti %endif %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build +find . -type f -exec chmod a-x "{}" + +dos2unix README.md %cmake -DBUILD_BENCHMARKS=OFF -DCMAKE_INSTALL_CMAKEDIR=cmake #make unit tests pass export LD_LIBRARY_PATH=%{_builddir}/rttr-%{version}/build/lib/ @@ -61,56 +63,48 @@ export LD_LIBRARY_PATH=%{_builddir}/rttr-%{version}/build/lib/ #make unit tests pass export LD_LIBRARY_PATH=%{_builddir}/rttr-%{version}/build/lib/ %cmake_install rttr_core - -#fix line endings of README.md -dos2unix %{buildroot}%{_datadir}/rttr/README.md +rm -Rf %{buildroot}/%{_datadir}/rttr %package -n lib%{name}_core0_9_6 -Summary: An open source library, which adds reflection to C++ +Summary: Run Time Type Reflection for C++ +Group: System/Libraries %description -n lib%{name}_core0_9_6 -RTTR stands for Run Time Type Reflection. It describes the ability of a computer program to introspect and modify an object at runtime. It is also the name of the library itself, which is written in C++ and released as open source library. - -The goal of this project is to provide an easy and intuitive way to use reflection in C++. +Run Time Type Reflection is the the ability of a computer program to +introspect and modify objects at runtime. It is also the name of the +library itself, which is written in C++. %post -n lib%{name}_core0_9_6 -p /sbin/ldconfig %postun -n lib%{name}_core0_9_6 -p /sbin/ldconfig - %files -n lib%{name}_core0_9_6 -%defattr(644,root,root,-) +%license LICENSE.txt %{_libdir}/librttr_core.so.%{version} %package devel -Summary: Development files necessary for building software that uses rttr -Requires: librttr_core0_9_6 -Group: Development/Languages/C and C++ +Summary: Header files for the C++ Run Time Type Reflection library +Group: Development/Languages/C and C++ +Requires: librttr_core0_9_6 = %{version} + %description devel -RTTR stands for Run Time Type Reflection. It describes the ability of a computer program to introspect and modify an object at runtime. It is also the name of the library itself, which is written in C++ and released as open source library. +Run Time Type Reflection is the the ability of a computer program to +introspect and modify objects at runtime. It is also the name of the +library itself, which is written in C++. -The goal of this project is to provide an easy and intuitive way to use reflection in C++. - - -%files devel -%defattr(644,root,root,-) +%files devel %{_includedir}/rttr/ %{_libdir}/librttr_core.so %{_libdir}/cmake/rttr/ -%package doc -Summary: Documentation for rttr -Group: Development/Languages/C and C++ -%description doc +%package devel-doc +Summary: Documentation for rttr +Group: Documentation/Other + +%description devel-doc API Documentation for rttr -%files doc -%defattr(644,root,root,-) -%docdir %{_datadir}/rttr -%docdir %{_docdir}/rttr/ - -%{_datadir}/rttr +%files devel-doc +%doc README.md %{_docdir}/rttr/ %changelog - - diff --git a/skip_json_example.patch b/skip_json_example.patch new file mode 100644 index 0000000..715c202 --- /dev/null +++ b/skip_json_example.patch @@ -0,0 +1,10 @@ +Index: rttr-0.9.6/src/examples/CMakeLists.txt +=================================================================== +--- rttr-0.9.6.orig/src/examples/CMakeLists.txt ++++ rttr-0.9.6/src/examples/CMakeLists.txt +@@ -25,5 +25,4 @@ + # # + #################################################################################### + +-add_subdirectory (json_serialization) + add_subdirectory (library_loading)