c_cpp/c__utilities
SHA256
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix file conflicts

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/home:mkittler/c++utilities?expand=0&rev=26
This commit is contained in:
Marius Kittler
2017-11-16 13:19:11 +00:00
committed by Git OBS Bridge
parent b26eedfd6f
commit 2dcadadf76
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libc++utilities4.changes → libc++utilities.changes
View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Nov 16 13:12:46 UTC 2017 - marius.kittler@suse.com
- Fix file conflicts
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 7 11:41:10 UTC 2017 - marius.kittler@suse.com Tue Nov 7 11:41:10 UTC 2017 - marius.kittler@suse.com

31
libc++utilities4.spec → libc++utilities.spec
View File

@@ -1,11 +1,13 @@
%define reponame c++utilities %define reponame c++utilities
Name: lib%{reponame}4 %define soname 4
Name: lib%{reponame}
Version: 4.11.0 Version: 4.11.0
Release: 1 Release: 1
License: GPL-2.0+ License: GPL-2.0+
Summary: Common C++ classes and routines Summary: Common C++ classes and routines
Url: https://github.com/Martchus/cpp-utilities Url: https://github.com/Martchus/cpp-utilities
Group: System/Packages Group: Development/Libraries/C and C++
Source: https://github.com/Martchus/cpp-utilities/archive/v%{version}/cpp-utilities-%{version}.tar.gz Source: https://github.com/Martchus/cpp-utilities/archive/v%{version}/cpp-utilities-%{version}.tar.gz
BuildRequires: cmake BuildRequires: cmake
BuildRequires: pkgconfig BuildRequires: pkgconfig
@@ -16,11 +18,17 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
Common C++ classes and routines such as argument parser, IO and conversion utilities. Common C++ classes and routines such as argument parser, IO and conversion utilities.
%package -n lib%{reponame}%{soname}
Summary: Common C++ classes and routines
Group: System/Libraries
%description -n lib%{reponame}%{soname}
Common C++ classes and routines such as argument parser, IO and conversion utilities.
%package devel %package devel
Summary: Devel files for %{reponame} Summary: Devel files for %{reponame}
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: %{name} = %{version} Requires: lib%{reponame}%{soname} = %{version}
Requires: glibc-devel Requires: glibc-devel
Requires: libstdc++-devel Requires: libstdc++-devel
Requires: cmake Requires: cmake
@@ -35,12 +43,12 @@ Development files for %{reponame}
%build %build
mkdir -p build mkdir -p build
cd build cd build
cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ cmake -DCMAKE_INSTALL_PREFIX:STRING=%{_prefix} \
-DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=TRUE \
-DCMAKE_C_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \ -DCMAKE_C_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \
-DCMAKE_CXX_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$RPM_OPT_FLAGS" \
-DCMAKE_BUILD_TYPE=Release \ -DCMAKE_BUILD_TYPE:STRING=Release \
-DLIB_SUFFIX_64="64" \ -DLIB_SUFFIX_64:STRING="64" \
.. ..
make %{?_smp_mflags} make %{?_smp_mflags}
@@ -52,18 +60,19 @@ make check %{?_smp_mflags}
cd build cd build
make install DESTDIR=%{buildroot} %{?_smp_mflags} make install DESTDIR=%{buildroot} %{?_smp_mflags}
%post %post -n lib%{reponame}%{soname}
ldconfig ldconfig
%postun %postun -n lib%{reponame}%{soname}
ldconfig ldconfig
%files %files -n lib%{reponame}%{soname}
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/lib%{reponame}.so* %{_libdir}/lib%{reponame}.so.%{soname}*
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{_includedir}/%{reponame} %{_includedir}/%{reponame}
%{_datadir}/%{reponame} %{_datadir}/%{reponame}
%{_libdir}/pkgconfig/%{reponame}.pc %{_libdir}/pkgconfig/%{reponame}.pc
%{_libdir}/lib%{reponame}.so