SHA256
1
0
forked from pool/rttr

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
This commit is contained in:
Adam Majer 2019-03-15 10:32:53 +00:00 committed by Git OBS Bridge
parent aede2f5189
commit c37e41ce04
3 changed files with 58 additions and 42 deletions

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Mar 15 07:58:36 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
- 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 <jengelh@inai.de>
- Fix RPM groups, trim filler wording from descriptions.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 21 22:43:53 UTC 2018 - dan.weatherill@cantab.net Thu Jun 21 22:43:53 UTC 2018 - dan.weatherill@cantab.net

View File

@ -1,7 +1,7 @@
# #
# spec file for package rttr # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # 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 Name: rttr
Version: 0.9.6 Version: 0.9.6
Release: 0 Release: 0
Summary: An open source library, which adds reflection to C++ Summary: Run Time Type Reflection for C++
License: MIT License: MIT
Url: http://www.rttr.org/releases/rttr-%{version}-src.tar.gz
Group: Development/Languages/C and C++ Group: Development/Languages/C and C++
URL: http://www.rttr.org/releases/rttr-%{version}-src.tar.gz
Source0: %{name}-%{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) #PATCH-FIX-OPENSUSE cxx11_compiler_flags.patch force c++11 mode on gcc4.8 (for Leap 42.3)
Patch0: cxx11_compiler_flags.patch Patch0: cxx11_compiler_flags.patch
@ -30,18 +30,17 @@ Patch0: cxx11_compiler_flags.patch
Patch1: cmake_install_dir.patch Patch1: cmake_install_dir.patch
#PATCH-FIX-OPENSUSE doxygen_remove_date_time.patch remove date and time information from generated documentation #PATCH-FIX-OPENSUSE doxygen_remove_date_time.patch remove date and time information from generated documentation
Patch2: doxygen_remove_date_time.patch 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: cmake
BuildRequires: gcc-c++
BuildRequires: doxygen
BuildRequires: dos2unix BuildRequires: dos2unix
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: doxygen
BuildRequires: gcc-c++
%description %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. 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
The goal of this project is to provide an easy and intuitive way to use reflection in C++. library itself, which is written in C++.
%prep %prep
%setup -q -n%{name}-%{version} %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 %endif
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%build %build
find . -type f -exec chmod a-x "{}" +
dos2unix README.md
%cmake -DBUILD_BENCHMARKS=OFF -DCMAKE_INSTALL_CMAKEDIR=cmake %cmake -DBUILD_BENCHMARKS=OFF -DCMAKE_INSTALL_CMAKEDIR=cmake
#make unit tests pass #make unit tests pass
export LD_LIBRARY_PATH=%{_builddir}/rttr-%{version}/build/lib/ 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 #make unit tests pass
export LD_LIBRARY_PATH=%{_builddir}/rttr-%{version}/build/lib/ export LD_LIBRARY_PATH=%{_builddir}/rttr-%{version}/build/lib/
%cmake_install rttr_core %cmake_install rttr_core
rm -Rf %{buildroot}/%{_datadir}/rttr
#fix line endings of README.md
dos2unix %{buildroot}%{_datadir}/rttr/README.md
%package -n lib%{name}_core0_9_6 %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 %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. 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
The goal of this project is to provide an easy and intuitive way to use reflection in C++. library itself, which is written in C++.
%post -n lib%{name}_core0_9_6 -p /sbin/ldconfig %post -n lib%{name}_core0_9_6 -p /sbin/ldconfig
%postun -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 %files -n lib%{name}_core0_9_6
%defattr(644,root,root,-) %license LICENSE.txt
%{_libdir}/librttr_core.so.%{version} %{_libdir}/librttr_core.so.%{version}
%package devel %package devel
Summary: Development files necessary for building software that uses rttr Summary: Header files for the C++ Run Time Type Reflection library
Requires: librttr_core0_9_6 Group: Development/Languages/C and C++
Group: Development/Languages/C and C++ Requires: librttr_core0_9_6 = %{version}
%description devel %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
%files devel
%defattr(644,root,root,-)
%{_includedir}/rttr/ %{_includedir}/rttr/
%{_libdir}/librttr_core.so %{_libdir}/librttr_core.so
%{_libdir}/cmake/rttr/ %{_libdir}/cmake/rttr/
%package doc %package devel-doc
Summary: Documentation for rttr Summary: Documentation for rttr
Group: Development/Languages/C and C++ Group: Documentation/Other
%description doc
%description devel-doc
API Documentation for rttr API Documentation for rttr
%files doc %files devel-doc
%defattr(644,root,root,-) %doc README.md
%docdir %{_datadir}/rttr
%docdir %{_docdir}/rttr/
%{_datadir}/rttr
%{_docdir}/rttr/ %{_docdir}/rttr/
%changelog %changelog

10
skip_json_example.patch Normal file
View File

@ -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)