From c8620e6d092dc7a8f17dca5515d7ff8f1cac602b Mon Sep 17 00:00:00 2001 From: Jaroslav Škarvada Date: Jan 13 2020 17:46:18 +0000 Subject: Initial import (#1787618) Signed-off-by: Jaroslav Škarvada --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..49f160b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/libzia-4.18.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 39fec79..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# libzia - -The libzia package \ No newline at end of file diff --git a/libzia-4.18-configure-fix.patch b/libzia-4.18-configure-fix.patch new file mode 100644 index 0000000..9199356 --- /dev/null +++ b/libzia-4.18-configure-fix.patch @@ -0,0 +1,21 @@ +diff --git a/configure.ac b/configure.ac +index c9bb160..4cacb88 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,5 @@ + AC_INIT(libzia, 4.18) +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + AC_CONFIG_SRCDIR(src/eprintf.c) + AC_CANONICAL_TARGET + AM_INIT_AUTOMAKE +@@ -11,8 +11,7 @@ fi + if test -f "/etc/SuSE-release"; then + echo "TIP: If following test fails, try to run: yast -i gcc" + fi +-AC_PROG_LIBTOOL +-#LT_INIT([dlopen]) ++LT_INIT([dlopen]) + AC_CONFIG_MACRO_DIR([m4]) + + dnl Determine default prefix diff --git a/libzia-4.18-fsf-address-fix.patch b/libzia-4.18-fsf-address-fix.patch new file mode 100644 index 0000000..6f4b5bc --- /dev/null +++ b/libzia-4.18-fsf-address-fix.patch @@ -0,0 +1,15 @@ +diff --git a/include/regex_.h b/include/regex_.h +index c63cba8..e3bd5cc 100644 +--- a/include/regex_.h ++++ b/include/regex_.h +@@ -16,8 +16,8 @@ + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free +- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +- 02111-1307 USA. */ ++ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, ++ MA 02110-1301 USA. */ + + + #include diff --git a/libzia-4.18-soname-fix.patch b/libzia-4.18-soname-fix.patch new file mode 100644 index 0000000..b20a8ce --- /dev/null +++ b/libzia-4.18-soname-fix.patch @@ -0,0 +1,26 @@ +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.spec b/libzia.spec new file mode 100644 index 0000000..a96dc90 --- /dev/null +++ b/libzia.spec @@ -0,0 +1,78 @@ +Name: libzia +Version: 4.18 +Release: 3%{?dist} +Summary: Platform abstraction layer for the tucnak package +License: GPLv2 +URL: http://tucnak.nagano.cz/ +Source: http://tucnak.nagano.cz/%{name}-%{version}.tar.gz +BuildRequires: gcc +BuildRequires: make +BuildRequires: automake +BuildRequires: libtool +BuildRequires: glib2-devel +BuildRequires: gtk2-devel +BuildRequires: SDL-devel +BuildRequires: libpng-devel +BuildRequires: libftdi-devel +# This is to fulfill Fedora requirement - it marks the interface with +# 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 +# Sent upstream +Patch1: libzia-4.18-configure-fix.patch +# Sent upstream +Patch2: libzia-4.18-fsf-address-fix.patch + +%description +Platform abstraction layer for the tucnak package. + +%package devel +Summary: Development files for libzia +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +Development files for libzia + +%prep +%setup -q +%patch0 -p1 -b .soname-fix +%patch1 -p1 -b .configure-fix +%patch2 -p1 -b .fsf-address-fix + +%build +autoreconf -fi +%configure --disable-static +%make_build + +%install +%make_install + +# drop .la +rm -f %{buildroot}%{_libdir}/libzia.la + +# drop unneeded files +rm -f %{buildroot}%{_datadir}/libzia/doc/* +rm -f %{buildroot}%{_datadir}/libzia/settings +rm -f %{buildroot}%{_prefix}/lib/libzia/* +rmdir %{buildroot}%{_datadir}/libzia/doc/ %{buildroot}%{_datadir}/libzia %{buildroot}%{_prefix}/lib/libzia + +%files +%license COPYING +%doc AUTHORS +%{_libdir}/libzia-%{version}.so.0* + +%files devel +%{_bindir}/zia-config +%{_includedir}/libzia +%{_libdir}/libzia.so + +%changelog +* Wed Jan 8 2020 Jaroslav Škarvada - 4.18-3 +- More fixes according to review + +* Tue Jan 7 2020 Jaroslav Škarvada - 4.18-2 +- Fixed according to review + +* Fri Jan 3 2020 Jaroslav Škarvada - 4.18-1 +- Initial version diff --git a/sources b/sources new file mode 100644 index 0000000..8cc5fa4 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (libzia-4.18.tar.gz) = 7d4287cf6804ae757d6c96c03fd948db1bf0b5463d345929b2c8dd4540e66b45849a8096500576199fa650b63b892ea17c976338b88e9310d64f804fa3920489