]> git.pld-linux.org Git - packages/libast.git/commitdiff
- updated to 0.8 master auto/th/libast-0.8-1
authorJakub Bogusz <qboosh@pld-linux.org>
Fri, 29 Jul 2022 17:05:16 +0000 (19:05 +0200)
committerJakub Bogusz <qboosh@pld-linux.org>
Fri, 29 Jul 2022 17:05:16 +0000 (19:05 +0200)
- added link patch (drop unnecessary libs from `libast-config --libs`
- drop .la file

libast-link.patch [new file with mode: 0644]
libast.spec

diff --git a/libast-link.patch b/libast-link.patch
new file mode 100644 (file)
index 0000000..8ee0223
--- /dev/null
@@ -0,0 +1,21 @@
+--- libast-0.8/libast.m4.orig  2020-02-28 21:20:00.000000000 +0100
++++ libast-0.8/libast.m4       2022-07-29 18:56:53.598009192 +0200
+@@ -233,9 +233,6 @@ AC_DEFUN([AST_IMLIB2_SUPPORT], [
+                 AC_DEFINE([LIBAST_IMLIB2_SUPPORT], [1], [Define for Imlib2 support.])
+                 LIBAST_IMLIB2_SUPPORT="Imlib2"
+             else
+-                AC_CHECK_LIB(m, pow, LIBS="-lm $LIBS")
+-                AC_CHECK_LIB(dl, dlopen, LIBS="-ldl $LIBS")
+-                AC_CHECK_LIB(freetype, FT_Init_FreeType, GRLIBS="-lfreetype $GRLIBS", , $GRLIBS)
+                 AC_CHECK_LIB(Imlib2, imlib_create_image, [
+                                 GRLIBS="-lImlib2 $GRLIBS"
+                                 AC_DEFINE([LIBAST_IMLIB2_SUPPORT], [1], [Define for Imlib2 support.])
+@@ -456,7 +453,7 @@ AC_DEFUN([AST_FLAGS], [
+     CFLAGS=${CFLAGS--O}
+     LDFLAGS=`eval eval eval eval eval echo "-L$libdir -L$prefix/lib ${LDFLAGS--O}"`
+     LDFLAGS=`echo $LDFLAGS | tr ' ' '\n' | uniq | grep -v NONE | tr '\n' ' '`
+-    LIBS="$GRLIBS $X_PRE_LIBS $LIBS $X_EXTRA_LIBS"
++    LIBS="$GRLIBS $LIBS $X_EXTRA_LIBS"
+ ])
+ dnl#
index ac2f901bc830cb6ba74aaad93fc915122be37529..60665b1693d4c63d41d15b9e8b688bdab0b61be8 100644 (file)
@@ -1,20 +1,24 @@
 #
 # Conditional build:
-%bcond_without static_libs     # don't build static library
+%bcond_without static_libs     # static library
 #
 Summary:       Library of Assorted Spiffy Things
 Summary(pl.UTF-8):     Biblioteka AST (Assorted Spiffy Things)
 Name:          libast
-Version:       0.7
-Release:       4
+Version:       0.8
+Release:       1
 License:       BSD
 Group:         Libraries
-Source0:       http://www.eterm.org/download/%{name}-%{version}.tar.gz
-# Source0-md5: a9ec3b2da317f35869316e6d9571d296
+#Source0Download: https://github.com/mej/libast/tags
+Source0:       https://github.com/mej/libast/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 0e625e406fe6ddd0e053baf719373f55
+Patch0:                %{name}-link.patch
 URL:           http://www.eterm.org/
 BuildRequires: automake
+BuildRequires: curl-devel >= 7.9.0
 BuildRequires: imlib2-devel
 BuildRequires: pcre-devel
+BuildRequires: xorg-lib-libX11-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -57,9 +61,14 @@ Biblioteki statyczne libast.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-cp -f /usr/share/automake/config.sub .
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
        %{!?with_static_libs:--disable-static}
 %{__make}
@@ -70,6 +79,12 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# broken install
+%{__mv} $RPM_BUILD_ROOT%{_includedir}/{sysdefs,types}.h $RPM_BUILD_ROOT%{_includedir}/libast
+
+# obsoleted by libast-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libast.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -87,8 +102,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc DESIGN
 %attr(755,root,root) %{_bindir}/libast-config
 %attr(755,root,root) %{_libdir}/libast.so
-%{_libdir}/libast.la
-%{_includedir}/libast*
+%{_includedir}/libast
+%{_includedir}/libast.h
 %{_aclocaldir}/libast.m4
 
 %if %{with static_libs}
This page took 0.046025 seconds and 4 git commands to generate.