move /etc/paperspecs to libpaper to ensure proper functionality in cases where paper subpackage is not installed, fix Requires to include epoch

This commit is contained in:
Tom Callaway 2023-01-09 01:02:44 -05:00
parent 026d9c0417
commit b6dd6bcc1a

View File

@ -1,6 +1,6 @@
Name: libpaper Name: libpaper
Version: 2.0.4 Version: 2.0.4
Release: 1%{?dist} Release: 2%{?dist}
# Needed to replace separate paper package # Needed to replace separate paper package
Epoch: 1 Epoch: 1
Summary: Library and tools for handling papersize Summary: Library and tools for handling papersize
@ -37,7 +37,7 @@ to develop applications which use libpaper.
%package -n paper %package -n paper
Summary: Print paper size information Summary: Print paper size information
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
# This is licensed differently from libpaper. # This is licensed differently from libpaper.
# paper.c is GPL-3.0-or-later # paper.c is GPL-3.0-or-later
# localepaper.c is FSFAP (except it is missing the warranty disclaimer... but the intent is clear) # localepaper.c is FSFAP (except it is missing the warranty disclaimer... but the intent is clear)
@ -94,6 +94,7 @@ install -m0755 src/localepaper %{buildroot}%{_libexecdir}
%files %files
%doc ChangeLog README %doc ChangeLog README
%license COPYING %license COPYING
%config(noreplace) %{_sysconfdir}/paperspecs
%{_libdir}/libpaper.so.* %{_libdir}/libpaper.so.*
%files devel %files devel
@ -101,13 +102,17 @@ install -m0755 src/localepaper %{buildroot}%{_libexecdir}
%{_libdir}/libpaper.so %{_libdir}/libpaper.so
%files -n paper %files -n paper
%config(noreplace) %{_sysconfdir}/paperspecs
%{_bindir}/paper %{_bindir}/paper
%{_libexecdir}/localepaper %{_libexecdir}/localepaper
%{_mandir}/man1/* %{_mandir}/man1/*
%{_mandir}/man5/* %{_mandir}/man5/*
%changelog %changelog
* Mon Jan 9 2023 Tom Callaway <spot@fedoraproject.org> - 2.0.4-2
- move /etc/paperspecs to libpaper to ensure proper functionality in cases where paper subpackage
is not installed
- fix Requires to include epoch
* Sun Jan 8 2023 Tom Callaway <spot@fedoraproject.org> - 2.0.4-1 * Sun Jan 8 2023 Tom Callaway <spot@fedoraproject.org> - 2.0.4-1
- update to 2.0.4 - update to 2.0.4