- new Source URL, updated to 0.4.2

diff --git a/libvisual-link.patch b/libvisual-link.patch
index add237117f7915b04cc83723007fbb2e609f713d..1daa93938ec71e7a6987a7f58b54bc8c4d712e6b 100644 (file)
--- a/libvisual-link.patch
+++ b/libvisual-link.patch
@@ -1,6 +1,6 @@
---- libvisual-0.4.0/libvisual/Makefile.am.orig 2006-02-20 09:20:58.000000000 +0100
-+++ libvisual-0.4.0/libvisual/Makefile.am      2006-03-22 19:25:47.953499500 +0100
-@@ -19,8 +19,6 @@
+--- libvisual-0.4.2/libvisual/Makefile.am.orig 2023-03-20 03:04:17.000000000 +0100
++++ libvisual-0.4.2/libvisual/Makefile.am      2023-09-24 13:23:22.682294890 +0200
+@@ -19,8 +19,6 @@ lib_LTLIBRARIES = libvisual-@LIBVISUAL_V
  
  DEFS = @DEFS@
  
@@ -9,8 +9,8 @@
  PLUGPATH = $(libdir)/libvisual
  
  AM_CFLAGS = -DPLUGPATH="\"$(LIBVISUAL_PLUGINS_BASE_DIR)\"" \
-@@ -30,6 +28,7 @@
-          -I$(top_builddir) -I$(top_builddir)/libvisual
+@@ -30,6 +28,7 @@ AM_CPPFLAGS = -I$(top_srcdir) -I$(top_sr
+       -I$(top_builddir) -I$(top_builddir)/libvisual
  
  libvisual_@LIBVISUAL_VERSION_SUFFIX@_la_LDFLAGS = -export-dynamic -no-undefined
 +libvisual_@LIBVISUAL_VERSION_SUFFIX@_la_LIBADD = $(LV_THREAD_LIBS) @LTLIBINTL@

diff --git a/libvisual.spec b/libvisual.spec
index 86b8cb7e3aa6f728edac38379e2b547a0a664a71..2ac2d40ceb02eb5c027128b2d69fe36d310afe1d 100644 (file)
--- a/libvisual.spec
+++ b/libvisual.spec
@@ -1,19 +1,26 @@
+#
+# Conditional build:
+%bcond_without static_libs     # static library
+
 Summary:       Abstraction library that comes between applications and audio visualisation plugins
 Summary(pl.UTF-8):     Abstrakcyjna biblioteka pomiędzy aplikacjami a wtyczkami wizualizacji audio
 Name:          libvisual
-Version:       0.4.1
+Version:       0.4.2
 Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
-Source0:       https://downloads.sourceforge.net/libvisual/%{name}-%{version}.tar.bz2
-# Source0-md5: 7ad5a74317337d91e87c905fd5d8013e
+#Source0Download: https://github.com/Libvisual/libvisual/releases
+Source0:       https://github.com/Libvisual/libvisual/releases/download/%{name}-%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5: be428534ab46f72d006eb11a799465a6
 Patch0:                %{name}-link.patch
 Patch1:                %{name}-NULL.patch
 URL:           http://libvisual.org/
+BuildRequires: SDL-devel >= 1.2.0
 BuildRequires: autoconf >= 2.57
 BuildRequires: automake >= 1:1.7
 BuildRequires: gettext-tools >= 0.19
-BuildRequires: libtool
+BuildRequires: libstdc++-devel >= 6:4.7
+BuildRequires: libtool >= 2:2
 BuildRequires: pkgconfig >= 1:0.14
 Obsoletes:     libvisual-tools < 0.4.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -63,7 +70,7 @@ Statyczna biblioteka libvisual.
 %{__autoheader}
 %{__automake}
 %configure \
-       --enable-static
+       %{?with_static_libs:--enable-static}
 %{__make}
 
 %install
@@ -89,9 +96,11 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}-0.4.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
+%attr(755,root,root) %{_bindir}/lv-tool-0.4
 %attr(755,root,root) %{_libdir}/libvisual-0.4.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libvisual-0.4.so.0
 %dir %{_libdir}/libvisual-0.4
+%{_mandir}/man1/lv-tool-0.4.1*
 
 %files devel
 %defattr(644,root,root,755)
@@ -99,6 +108,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/libvisual-0.4
 %{_pkgconfigdir}/libvisual-0.4.pc
 
+%if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libvisual-0.4.a
+%endif