From c59d7413db5c8f93fc5aa2f47350ac152650c8b3 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Sun, 20 Dec 2020 12:59:06 +0100 Subject: [PATCH] - updated to 2.68 as glibmm2.68 (C++17/libsigc++3 based, parallel installable with glibmm-2.4 ABI series) --- glibmm.spec => glibmm2.68.spec | 89 ++++++++++++++++------------------ 1 file changed, 42 insertions(+), 47 deletions(-) rename glibmm.spec => glibmm2.68.spec (65%) diff --git a/glibmm.spec b/glibmm2.68.spec similarity index 65% rename from glibmm.spec rename to glibmm2.68.spec index 9b4531d..bf9e93d 100644 --- a/glibmm.spec +++ b/glibmm2.68.spec @@ -4,35 +4,34 @@ # Conditional build: %bcond_without static_libs # don't build static library -%define glib_ver 1:2.62.0 -%define libsigc_ver 1:2.10.0 +%define glib_ver 1:2.63.0 +%define libsigc_ver 1:3.0.0 Summary: A C++ interface for glib library Summary(pl.UTF-8): Interfejs C++ dla biblioteki glib -Name: glibmm -Version: 2.64.5 +Name: glibmm2.68 +Version: 2.68.0 Release: 1 License: LGPL v2+ Group: Libraries -Source0: https://download.gnome.org/sources/glibmm/2.64/%{name}-%{version}.tar.xz -# Source0-md5: 02c40e6bc0721c564e4b033a18cb3a8e +Source0: https://download.gnome.org/sources/glibmm/2.68/glibmm-%{version}.tar.xz +# Source0-md5: 928ca50521cf6851b433dc1b950ba344 URL: https://www.gtkmm.org/ BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1:1.11 BuildRequires: doxygen >= 1:1.8.9 BuildRequires: glib2-devel >= %{glib_ver} -BuildRequires: libsigc++-devel >= %{libsigc_ver} -BuildRequires: libstdc++-devel >= 6:4.7 +BuildRequires: libsigc++3-devel >= %{libsigc_ver} +BuildRequires: libstdc++-devel >= 6:7 BuildRequires: libtool >= 2:2.0 BuildRequires: m4 -BuildRequires: mm-common >= 0.9.10 +BuildRequires: mm-common >= 0.9.12 BuildRequires: perl-base BuildRequires: pkgconfig BuildRequires: rpmbuild(macros) >= 1.752 BuildRequires: tar >= 1:1.22 BuildRequires: xz Requires: glib2 >= %{glib_ver} -Requires: libsigc++ >= %{libsigc_ver} -Obsoletes: gtkmm-glib +Requires: libsigc++3 >= %{libsigc_ver} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -47,9 +46,8 @@ Summary(pl.UTF-8): Pliki nagłówkowe biblioteki glibmm Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: glib2-devel >= %{glib_ver} -Requires: libsigc++-devel >= %{libsigc_ver} -Requires: libstdc++-devel >= 6:4.7 -Obsoletes: gtkmm-glib-devel +Requires: libsigc++3-devel >= %{libsigc_ver} +Requires: libstdc++-devel >= 6:7 %description devel Header files for glibmm library. @@ -62,7 +60,6 @@ Summary: Static glibmm library Summary(pl.UTF-8): Statyczna biblioteka glibmm Group: Development/Libraries Requires: %{name}-devel = %{version}-%{release} -Obsoletes: gtkmm-glib-static %description static Static glibmm library. @@ -75,8 +72,6 @@ Summary: Reference documentation for glibmm Summary(pl.UTF-8): Szczegółowa dokumentacja dla glibmm Group: Documentation Requires: gtk-doc-common -Provides: glibmm-doc -Obsoletes: glibmm-doc %{?noarchpackage} %description apidocs @@ -97,7 +92,7 @@ Examples for glibmm. Przykłady dla glibmm. %prep -%setup -q +%setup -q -n glibmm-%{version} %build mm-common-prepare --copy --force @@ -119,10 +114,10 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ - libdocdir=%{_gtkdocdir}/%{name}-2.4 \ - devhelpdir=%{_gtkdocdir}/%{name}-2.4 + libdocdir=%{_gtkdocdir}/glibmm-2.68 \ + devhelpdir=%{_gtkdocdir}/glibmm-2.68 -cp -r examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} +cp -pr examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} %{__rm} $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}/Makefile* \ $RPM_BUILD_ROOT%{_libdir}/*.la @@ -135,43 +130,43 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README -%attr(755,root,root) %{_libdir}/libgiomm-2.4.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libgiomm-2.4.so.1 -%attr(755,root,root) %{_libdir}/libglibmm-2.4.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libglibmm-2.4.so.1 -%attr(755,root,root) %{_libdir}/libglibmm_generate_extra_defs-2.4.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libglibmm_generate_extra_defs-2.4.so.1 +%attr(755,root,root) %{_libdir}/libgiomm-2.68.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libgiomm-2.68.so.1 +%attr(755,root,root) %{_libdir}/libglibmm-2.68.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libglibmm-2.68.so.1 +%attr(755,root,root) %{_libdir}/libglibmm_generate_extra_defs-2.68.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libglibmm_generate_extra_defs-2.68.so.1 %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libgiomm-2.4.so -%attr(755,root,root) %{_libdir}/libglibmm-2.4.so -%attr(755,root,root) %{_libdir}/libglibmm_generate_extra_defs-2.4.so -%dir %{_libdir}/giomm-2.4 -%{_libdir}/giomm-2.4/include -%dir %{_libdir}/glibmm-2.4 -%{_libdir}/glibmm-2.4/include -%dir %{_libdir}/glibmm-2.4/proc -%{_libdir}/glibmm-2.4/proc/m4 -%{_libdir}/glibmm-2.4/proc/pm -%attr(755,root,root) %{_libdir}/glibmm-2.4/proc/generate_wrap_init.pl -%attr(755,root,root) %{_libdir}/glibmm-2.4/proc/gmmproc -%{_includedir}/giomm-2.4 -%{_includedir}/glibmm-2.4 -%{_pkgconfigdir}/giomm-2.4.pc -%{_pkgconfigdir}/glibmm-2.4.pc +%attr(755,root,root) %{_libdir}/libgiomm-2.68.so +%attr(755,root,root) %{_libdir}/libglibmm-2.68.so +%attr(755,root,root) %{_libdir}/libglibmm_generate_extra_defs-2.68.so +%dir %{_libdir}/giomm-2.68 +%{_libdir}/giomm-2.68/include +%dir %{_libdir}/glibmm-2.68 +%{_libdir}/glibmm-2.68/include +%dir %{_libdir}/glibmm-2.68/proc +%{_libdir}/glibmm-2.68/proc/m4 +%{_libdir}/glibmm-2.68/proc/pm +%attr(755,root,root) %{_libdir}/glibmm-2.68/proc/generate_wrap_init.pl +%attr(755,root,root) %{_libdir}/glibmm-2.68/proc/gmmproc +%{_includedir}/giomm-2.68 +%{_includedir}/glibmm-2.68 +%{_pkgconfigdir}/giomm-2.68.pc +%{_pkgconfigdir}/glibmm-2.68.pc %if %{with static_libs} %files static %defattr(644,root,root,755) -%{_libdir}/libgiomm-2.4.a -%{_libdir}/libglibmm-2.4.a -%{_libdir}/libglibmm_generate_extra_defs-2.4.a +%{_libdir}/libgiomm-2.68.a +%{_libdir}/libglibmm-2.68.a +%{_libdir}/libglibmm_generate_extra_defs-2.68.a %endif %files apidocs %defattr(644,root,root,755) -%{_gtkdocdir}/glibmm-2.4 +%{_gtkdocdir}/glibmm-2.68 %files examples %defattr(644,root,root,755) -- 2.44.0