SPECS/librevenge.spec

@@ -2,7 +2,7 @@
 
 Name: librevenge
 Version: 0.0.4
-Release: 22%{?dist}
+Release: 12%{?dist}
 Summary: A base library for writing document import filters
 
 # src/lib/RVNGOLEStream.{h,cpp} are BSD
@@ -12,10 +12,8 @@ Source: http://downloads.sourceforge.net/libwpd/%{name}-%{version}.tar.xz
 
 BuildRequires: boost-devel
 BuildRequires: doxygen
-BuildRequires: gcc-c++
 BuildRequires: pkgconfig(cppunit)
 BuildRequires: pkgconfig(zlib)
-BuildRequires: make
 
 %description
 %{name} is a base library for writing document import filters. It has
@@ -37,10 +35,9 @@ BuildArch: noarch
 %description doc
 The %{name}-doc package contains documentation files for %{name}.
 
-%if ! 0%{?flatpak}
 %package gdb
 Summary: gdb pretty printers for %{name}
-Requires: gdb
+Recommends: gdb
 Requires: python3-six
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Supplements: %{name}-debuginfo%{?_isa} = %{version}-%{release}
@@ -48,37 +45,30 @@ Supplements: %{name}-debuginfo%{?_isa} = %{version}-%{release}
 %description gdb
 The %{name}-devel package contains gdb pretty printers that help with
 debugging applications that use %{name}.
-%endif
 
 %prep
 %autosetup -p1
 
 %build
-%configure \
-    --disable-silent-rules \
-    --disable-static \
-    --disable-werror \
-%if ! 0%{?flatpak}
-    --enable-pretty-printers
-%endif
-
+%configure --disable-silent-rules --disable-static --disable-werror --enable-pretty-printers
 sed -i \
     -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
     -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
     libtool
-%make_build
+make %{?_smp_mflags}
 
 %install
-%make_install
+make install DESTDIR=%{buildroot}
 rm -f %{buildroot}/%{_libdir}/*.la
 # we install API docs directly from build
 rm -rf %{buildroot}/%{_docdir}/%{name}
 
-%ldconfig_scriptlets
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
 %check
 export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
-%make_build check
+make %{?_smp_mflags} check
 
 %files
 %license COPYING.*
@@ -101,49 +91,16 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PA
 %license COPYING.*
 %doc docs/doxygen/html
 
-%if ! 0%{?flatpak}
 %files gdb
 %{_datadir}/gdb/auto-load%{_libdir}/%{name}-%{apiversion}.py*
 %{_datadir}/gdb/auto-load%{_libdir}/%{name}-stream-%{apiversion}.py*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/python
-%endif
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.0.4-22
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.0.4-21
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-20
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-19
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 0.0.4-18
-- Use make macros
-- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-17
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Fri Jan 17 2020 Sergio Durigan Junior <sergiodj@redhat.com> - 0.0.4-16
-- Resolves: rhbz#1786466 Do not use %%{?_isa} for GDB dependency.
-
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Wed Jun 19 2019 Kalev Lember <klember@redhat.com> - 0.0.4-14
-- Disable gdb pretty printers when building for flatpak
-
-* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Fri Jan 17 2020 Sergio Durigan Junior <sergiodj@redhat.com> - 0.0.4-12
+- Resolves: rhbz#1786466 Do not use %%{?_isa} for GDB dependency. Recommend
+  GDB, instead of requiring it.
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.0.4-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild