diff --git a/.gitignore b/.gitignore index 5b23483..5366572 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ verbiste-0.1.26.tar.gz /verbiste-0.1.45.tar.gz /verbiste-0.1.46.tar.gz /verbiste-0.1.47.tar.gz +/verbiste-0.1.48.tar.gz +/verbiste-0.1.49.tar.gz diff --git a/sources b/sources index 4f60ac0..1ef15d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (verbiste-0.1.47.tar.gz) = cc06d3e4a09b9edf2fe3996f527ae05fa50af909cc5ea6ed830d1b4f5706cf9b29028160cff842a211148e13d736f7e2cb74f10b3c5fd84d93a1038e05a26cbf +SHA512 (verbiste-0.1.49.tar.gz) = d7f9a8e6aa9b82f00b85bc24bbcaabc0d97958b98fbba06bf126a178a747ca07e659c67d00129ad149f96c58f3c965c0c49c899f757b93c38f83d4d7c4ea60d6 diff --git a/verbiste.spec b/verbiste.spec index fb3aa96..96a1005 100644 --- a/verbiste.spec +++ b/verbiste.spec @@ -1,19 +1,29 @@ -%global with_mate 0 +%if 0%{?rhel} >= 7 || 0%{?fedora} >= 44 +%bcond_with gnome +%else +%bcond_without gnome +%endif +%bcond_with mate Name: verbiste -Version: 0.1.47 -Release: 3%{?dist} +Version: 0.1.49 +Release: 7%{?dist} Summary: French conjugation system -License: GPLv2+ +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: gcc BuildRequires: gcc-c++ +%if %{with gnome} BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: libgnomeui-devel +%endif BuildRequires: libxml2-devel -%if 0%{?with_mate} +BuildRequires: libtool +BuildRequires: automake +%if %{with mate} BuildRequires: mate-panel-devel %endif BuildRequires: perl(XML::Parser) @@ -33,6 +43,7 @@ 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} @@ -40,8 +51,9 @@ Requires: hicolor-icon-theme %description gnome GNOME Panel applet and application based on Verbiste. +%endif -%if 0%{?with_mate} +%if %{with mate} %package mate Summary: MATE Desktop Panel applet for Verbiste Requires: %{name}%{?_isa} = %{version}-%{release} @@ -59,10 +71,17 @@ for DOCFILE in README NEWS HACKING LISEZMOI; do done %build +autoreconf -ivf %configure \ -%if 0%{?with_mate} +%if %{with mate} --with-mate-applet \ %endif +%if %{with gnome} + --with-gnome-app \ +%endif + --without-gtk-app \ + --disable-maintainer-mode \ + --without-examples \ --disable-rpath %make_build @@ -71,6 +90,7 @@ done 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 @@ -84,6 +104,16 @@ 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 @@ -93,12 +123,14 @@ rm -frv %{buildroot}%{_docdir} %{_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 @@ -106,8 +138,64 @@ rm -frv %{buildroot}%{_docdir} %{_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 + +* Sat Jul 20 2024 Fedora Release Engineering - 0.1.48-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 0.1.48-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Oct 28 2023 Didier Fabert - 0.1.48-2 +- migrated to SPDX license + +* Thu Aug 03 2023 Didier Fabert - 0.1.48-1 +- Update to 0.1.48 + +* Sat Jul 22 2023 Fedora Release Engineering - 0.1.47-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 0.1.47-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 0.1.47-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 0.1.47-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Aug 02 2021 Didier Fabert - 0.1.47-6 +- Remove BTBFS run autoreconf to fix rpath + +* Fri Jul 23 2021 Fedora Release Engineering - 0.1.47-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 0.1.47-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0.1.47-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild