From 9357b0e15a4bf6c75692829a42dec4dd8dd72eb1 Mon Sep 17 00:00:00 2001 From: Ondrej Mosnacek Date: Sun, 14 Nov 2021 09:54:36 +0100 Subject: [PATCH] Use %{version} where appropriate Some paths contain the full version, so use the macro to allow for smooth updates to new upstream releases. Note that there are still places where the major version is used explicitly - this is intentional to avoid accidental soname bumps (which should happen only between major versions). Signed-off-by: Ondrej Mosnacek --- quazip.spec | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/quazip.spec b/quazip.spec index b55d4e7..3be13b5 100644 --- a/quazip.spec +++ b/quazip.spec @@ -169,9 +169,9 @@ done ln -s libquazip1-qt4.so %{buildroot}%{_libdir}/libquazip.so install -d %{buildroot}%{_includedir}/quazip -pushd %{buildroot}%{_includedir}/QuaZip-Qt4-1.1/quazip +pushd %{buildroot}%{_includedir}/QuaZip-Qt4-%{version}/quazip for f in *; do - ln -s ../QuaZip-Qt4-1.1/quazip/$f %{buildroot}%{_includedir}/quazip/$f + ln -s ../QuaZip-Qt4-%{version}/quazip/$f %{buildroot}%{_includedir}/quazip/$f done popd @@ -183,9 +183,9 @@ install -pm 0644 %{SOURCE1} %{buildroot}%{_datadir}/cmake/Modules/FindQuaZip.cma ln -s libquazip1-qt5.so %{buildroot}%{_libdir}/libquazip5.so install -d %{buildroot}%{_includedir}/quazip5 -pushd %{buildroot}%{_includedir}/QuaZip-Qt5-1.1/quazip +pushd %{buildroot}%{_includedir}/QuaZip-Qt5-%{version}/quazip for f in *; do - ln -s ../QuaZip-Qt5-1.1/quazip/$f %{buildroot}%{_includedir}/quazip5/$f + ln -s ../QuaZip-Qt5-%{version}/quazip/$f %{buildroot}%{_includedir}/quazip5/$f done popd @@ -232,9 +232,9 @@ export QT_ENABLE_REGEXP_JIT=0 %files devel %doc doc/html -%{_includedir}/QuaZip-Qt4-1.1/ +%{_includedir}/QuaZip-Qt4-%{version}/ %{_libdir}/libquazip1-qt4.so -%{_libdir}/cmake/QuaZip-Qt4-1.1/ +%{_libdir}/cmake/QuaZip-Qt4-%{version}/ %{_libdir}/pkgconfig/quazip1-qt4.pc # pre-1.0 compat files %{_includedir}/quazip/ @@ -250,9 +250,9 @@ export QT_ENABLE_REGEXP_JIT=0 %files qt5-devel %doc doc/html -%{_includedir}/QuaZip-Qt5-1.1/ +%{_includedir}/QuaZip-Qt5-%{version}/ %{_libdir}/libquazip1-qt5.so -%{_libdir}/cmake/QuaZip-Qt5-1.1/ +%{_libdir}/cmake/QuaZip-Qt5-%{version}/ %{_libdir}/pkgconfig/quazip1-qt5.pc # pre-1.0 compat files %{_includedir}/quazip5/ @@ -268,9 +268,9 @@ export QT_ENABLE_REGEXP_JIT=0 %files qt6-devel %doc doc/html -%{_includedir}/QuaZip-Qt6-1.1/ +%{_includedir}/QuaZip-Qt6-%{version}/ %{_libdir}/libquazip1-qt6.so -%{_libdir}/cmake/QuaZip-Qt6-1.1/ +%{_libdir}/cmake/QuaZip-Qt6-%{version}/ # qt6-qtbase-devel currently doesn't provide pkgconfig(Qt6Core) # https://bugreports.qt.io/browse/QTBUG-86080 %exclude %{_libdir}/pkgconfig/quazip1-qt6.pc