X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=libast.spec;h=60665b1693d4c63d41d15b9e8b688bdab0b61be8;hb=HEAD;hp=a613fc83b70fac5626c40ab2ebf3af4384c66d4d;hpb=c4b79b9789358cf817da2e34dd56dcd9c062fc43;p=packages%2Flibast.git

diff --git a/libast.spec b/libast.spec
index a613fc8..60665b1 100644
--- a/libast.spec
+++ b/libast.spec
@@ -1,17 +1,24 @@
+#
+# Conditional build:
+%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
+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:	XFree86-devel
 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
@@ -31,7 +38,6 @@ Summary:	Library of Assorted Spiffy Things header files
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki AST
 Group:		X11/Development/Libraries
 Requires:	%{name} = %{version}-%{release}
-Requires:	XFree86-devel
 Requires:	imlib2-devel
 Requires:	pcre-devel
 
@@ -55,10 +61,16 @@ Biblioteki statyczne libast.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-cp -f /usr/share/automake/config.sub .
-%configure
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+	%{!?with_static_libs:--disable-static}
 %{__make}
 
 %install
@@ -67,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
 
@@ -77,16 +95,19 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc ChangeLog README
 %attr(755,root,root) %{_libdir}/libast.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libast.so.2
 
 %files devel
 %defattr(644,root,root,755)
 %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}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libast.a
+%endif