diff --git a/.gitignore b/.gitignore index 348216d..8be7c25 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /libzia-4.18.tar.gz /libzia-4.19.tar.gz /libzia-4.20.tar.gz +/libzia-4.24.tar.gz diff --git a/libzia-4.18-soname-fix.patch b/libzia-4.18-soname-fix.patch deleted file mode 100644 index b20a8ce..0000000 --- a/libzia-4.18-soname-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/bin/zia-config.in b/bin/zia-config.in -index d4160da..8a520db 100644 ---- a/bin/zia-config.in -+++ b/bin/zia-config.in -@@ -88,7 +88,7 @@ while test $# -gt 0; do - echo "$cflags" - ;; - --libs) -- echo "$libs -L$prefix/lib -lzia-@VERSION@ -lutil" -+ echo "$libs -L$prefix/lib -lzia -lutil" - ;; - --libs2) - echo "$libs" -diff --git a/src/Makefile.am b/src/Makefile.am -index 94a90a1..e0c7c04 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -74,7 +74,7 @@ libzia_la_SOURCES = \ - - - libzia_la_CFLAGS = $(Z_SVNVER) -I../include -I../include/unix --libzia_la_LDFLAGS = -release @VERSION@ -+libzia_la_LDFLAGS = -release @VERSION@ -version-info 0 - library_includedir = $(includedir)/libzia - - #zsdltest_SOURCES = zsdltest.c diff --git a/libzia-4.24-soname-fix.patch b/libzia-4.24-soname-fix.patch new file mode 100644 index 0000000..f8a67dc --- /dev/null +++ b/libzia-4.24-soname-fix.patch @@ -0,0 +1,26 @@ +diff --git a/bin/zia-config.in b/bin/zia-config.in +index 3494e0f..0430f53 100644 +--- a/bin/zia-config.in ++++ b/bin/zia-config.in +@@ -92,7 +92,7 @@ while test $# -gt 0; do + echo "$cflags" + ;; + --libs) +- echo "$libs -L$prefix/lib -lzia-@VERSION@ -lutil" ++ echo "$libs -L$prefix/lib -lzia -lutil" + ;; + --libs2) + echo "$libs" +diff --git a/src/Makefile.am b/src/Makefile.am +index 44a40fc..10b4a09 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -74,7 +74,7 @@ libzia_la_SOURCES = \ + + + libzia_la_CFLAGS = $(Z_SVNVER) -I../include -I../include/unix +-libzia_la_LDFLAGS = -release @VERSION@ ++libzia_la_LDFLAGS = -release @VERSION@ -version-info 0 + library_includedir = $(includedir)/libzia + + #zsdltest_SOURCES = zsdltest.c diff --git a/libzia.spec b/libzia.spec index 68cac15..f1a4cbc 100644 --- a/libzia.spec +++ b/libzia.spec @@ -1,6 +1,6 @@ Name: libzia -Version: 4.20 -Release: 2%{?dist} +Version: 4.24 +Release: 1%{?dist} Summary: Platform abstraction layer for the tucnak package License: GPLv2 URL: http://tucnak.nagano.cz/ @@ -18,7 +18,7 @@ BuildRequires: libftdi-devel # version number 0. Upstream uses --release versioning in libtool. # They do not support linking between different versions of tucnak and # libzia, i.e. tucnak-4.18 needs to be linked to libzia-4.18. -Patch0: libzia-4.18-soname-fix.patch +Patch0: libzia-4.24-soname-fix.patch %description Platform abstraction layer for the tucnak package. @@ -29,6 +29,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Requires: SDL-devel Requires: gtk2-devel Requires: libftdi-devel +Requires: pkgconf-pkg-config %description devel Development files for libzia @@ -63,8 +64,12 @@ rmdir %{buildroot}%{_datadir}/libzia/doc/ %{buildroot}%{_datadir}/libzia %{build %{_bindir}/zia-config %{_includedir}/libzia %{_libdir}/libzia.so +%{_libdir}/pkgconfig/libzia.pc %changelog +* Fri Nov 27 2020 Jaroslav Škarvada - 4.24-1 +- New version + * Tue Jul 28 2020 Fedora Release Engineering - 4.20-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index a67ffb6..3143019 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libzia-4.20.tar.gz) = 0780eb791fdd85778a074eddab933650d4fbb09a9b441432cf6e63fe97978d47c75155caa251820f283badb16ffa5ac2d323b1f98ab5864caaa020511ff856d5 +SHA512 (libzia-4.24.tar.gz) = e7952822861d7702494309d70e9d7385c5dfa929b521387bc81883d4316a5fae96c5776b00f81da6dcbaa2965fdf30ac8a8a1b9963806d36454ebd6886ddcbd1