diff --git a/verbiste.spec b/verbiste.spec index 96a1005..97d3fb0 100644 --- a/verbiste.spec +++ b/verbiste.spec @@ -1,29 +1,22 @@ -%if 0%{?rhel} >= 7 || 0%{?fedora} >= 44 -%bcond_with gnome -%else -%bcond_without gnome -%endif -%bcond_with mate +%global with_mate 0 Name: verbiste Version: 0.1.49 -Release: 7%{?dist} +Release: 1%{?dist} Summary: French conjugation system License: GPL-2.0-or-later URL: http://sarrazip.com/dev/verbiste.html Source: http://perso.b2b2c.ca/~sarrazip/dev/%{name}-%{version}.tar.gz -BuildRequires: make +BuildRequires: make BuildRequires: gcc BuildRequires: gcc-c++ -%if %{with gnome} BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: libgnomeui-devel -%endif BuildRequires: libxml2-devel BuildRequires: libtool BuildRequires: automake -%if %{with mate} +%if 0%{?with_mate} BuildRequires: mate-panel-devel %endif BuildRequires: perl(XML::Parser) @@ -43,7 +36,6 @@ Requires: libxml2-devel%{?_isa} This package contains libraries and header files for developing applications that use %{name}. -%if %{with gnome} %package gnome Summary: GNOME Panel applet for Verbiste Requires: %{name}%{?_isa} = %{version}-%{release} @@ -51,9 +43,8 @@ Requires: hicolor-icon-theme %description gnome GNOME Panel applet and application based on Verbiste. -%endif -%if %{with mate} +%if 0%{?with_mate} %package mate Summary: MATE Desktop Panel applet for Verbiste Requires: %{name}%{?_isa} = %{version}-%{release} @@ -73,13 +64,10 @@ done %build autoreconf -ivf %configure \ -%if %{with mate} +%if 0%{?with_mate} --with-mate-applet \ %endif -%if %{with gnome} --with-gnome-app \ -%endif - --without-gtk-app \ --disable-maintainer-mode \ --without-examples \ --disable-rpath @@ -90,7 +78,6 @@ autoreconf -ivf find %{buildroot} -name '*.la' -delete -print -%if %{with gnome} # This file gets created on x86_64 for no apparent reason. # It's owned by glibc-common. #rm -f %%{buildroot}%%{_datadir}/locale/locale.alias @@ -104,16 +91,6 @@ rm -frv %{buildroot}%{_docdir} %find_lang %{name} --with-man %find_lang french-conjugator --with-man %find_lang french-deconjugator --with-man -%else -rm -rf %{buildroot}%{_mandir}/man3 -rm -rf %{buildroot}%{_mandir}/*/man3 -%endif - -rm -frv %{buildroot}%{_docdir} -# This file gets created on x86_64 for no apparent reason. -# It's owned by glibc-common. -rm -f %{buildroot}%{_datadir}/locale/locale.alias - %ldconfig_scriptlets @@ -123,14 +100,12 @@ rm -f %{buildroot}%{_datadir}/locale/locale.alias %{_datadir}/verbiste* %{_libdir}/*.so.* %{_mandir}/man1/french-*.1* -%{_mandir}/*/man1/french-*.1* %files devel %{_includedir}/verbiste-0.1/ %{_libdir}/*.so %{_libdir}/pkgconfig/* -%if %{with gnome} %files gnome -f %{name}.lang -f french-conjugator.lang -f french-deconjugator.lang %{_bindir}/verbiste %{_bindir}/verbiste-gtk @@ -138,28 +113,8 @@ rm -f %{buildroot}%{_datadir}/locale/locale.alias %{_datadir}/icons/hicolor/*/apps/%{name}.* %{_datadir}/texmf/tex/latex/verbiste %{_mandir}/man3/verbiste.3* -%{_mandir}/*/man3/verbiste.3* -%endif %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 0.1.49-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Thu Jan 29 2026 Didier Fabert - 0.1.49-6 -- Fix f44 build (bugzilla #2435175) - -* Sat Jan 17 2026 Fedora Release Engineering - 0.1.49-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Sat Sep 06 2025 Didier Fabert - 0.1.49-4 -- Fix epel builds - -* Fri Jul 25 2025 Fedora Release Engineering - 0.1.49-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun Jan 19 2025 Fedora Release Engineering - 0.1.49-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - * Wed Aug 07 2024 Didier Fabert - 0.1.49-1 - Update to 0.1.49