Refactor openjade specfile

Use %%{buildroot} instead of  as it is more recent
Use directory macros and push/popd
Change % to %% in changelog
This refactor was created to fix of ostree bug in the following commit. They are minor changes which should not influence the build but make the spec file more readable and versatile.
This commit is contained in:
Ondřej Sloup 2023-07-10 14:31:18 +02:00
parent 285d2b91dd
commit 1e7304c808

View File

@ -1,7 +1,7 @@
Summary: A DSSSL implementation
Name: openjade
Version: 1.3.2
Release: 73%{?dist}
Release: 74%{?dist}
Requires: sgml-common
URL: http://openjade.sourceforge.net/
Source: http://download.sourceforge.net/openjade/openjade-%{version}.tar.gz
@ -67,26 +67,26 @@ make
%install
rm -rf $RPM_BUILD_ROOT
rm -rf %{buildroot}
make install install-man DESTDIR=$RPM_BUILD_ROOT
make install install-man DESTDIR=%{buildroot}
# oMy, othis ois osilly.
ln -s openjade $RPM_BUILD_ROOT/%{_bindir}/jade
echo ".so man1/openjade.1" > $RPM_BUILD_ROOT/%{_mandir}/man1/jade.1
# oMy, othis ois osilly., oyes
ln -s openjade %{buildroot}/%{_bindir}/jade
echo ".so man1/openjade.1" > %{buildroot}/%{_mandir}/man1/jade.1
# install jade/jade $RPM_BUILD_ROOT/%{prefix}/bin/jade
cp dsssl/catalog $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}-%{version}/
cp dsssl/{dsssl,style-sheet,fot}.dtd $RPM_BUILD_ROOT/%{_datadir}/sgml/%{name}-%{version}/
# Install jade/jade %%{buildroot}/%%{prefix}/bin/jade
cp dsssl/catalog %{buildroot}/%{_datadir}/sgml/%{name}-%{version}/
cp dsssl/{dsssl,style-sheet,fot}.dtd %{buildroot}/%{_datadir}/sgml/%{name}-%{version}/
# add unversioned/versioned catalog and symlink
mkdir -p $RPM_BUILD_ROOT/etc/sgml
cd $RPM_BUILD_ROOT/etc/sgml
# Add unversioned/versioned catalog and symlink
mkdir -p %{buildroot}/etc/sgml
pushd %{buildroot}/etc/sgml
touch %{name}-%{version}-%{release}.soc
ln -s %{name}-%{version}-%{release}.soc %{name}.soc
cd -
popd
rm -f $RPM_BUILD_ROOT%{_libdir}/*.so $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f %{buildroot}%{_libdir}/*.so %{buildroot}%{_libdir}/*.la
# Stop check-rpaths from complaining about standard runpaths.
export QA_RPATHS=0x0001
@ -105,16 +105,20 @@ export QA_RPATHS=0x0001
%files
%doc jadedoc/* dsssl/README.jadetex
%doc README COPYING VERSION
%ghost /etc/sgml/%{name}-%{version}-%{release}.soc
/etc/sgml/%{name}.soc
%ghost %{_sysconfdir}/sgml/%{name}-%{version}-%{release}.soc
%{_sysconfdir}/sgml/%{name}.soc
%{_bindir}/*
%{_libdir}/*.so.*
%{_mandir}/*/*
%{_datadir}/sgml/%{name}-%{version}
%changelog
* Tue Jun 27 2023 Ondrej Sloup <osloup@redhat.com> - 1.3.2-74
- Use %%{buildroot} instead of $RPM_BUILD_ROOT as it is more recent
- Use directory macros and push/popd
* Thu Jun 08 2023 Ondrej Sloup <osloup@redhat.com> - 1.3.2-73
- Use %autosetup instead of deprecated %patchN
- Use %%autosetup instead of deprecated %%patchN
- Update config.sub and config.guess files
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.2-72