Packman Build Service PMBS

Changes of Revision 21

lightspark.spec Changed

@@ -3,13 +3,18 @@
 #
 
 Name:           lightspark
-Version:        0.5.7+git20120601
+Version:        0.6.0+git20120606
 Release:        0
 License:        LGPL-3.0+
 Summary:        SWF desktop reader
 Url:            http://lightspark.github.com/
 Group:          Productivity/Multimedia/Other
-Source0:        %{name}-0.5.7%2Bgit20120601.tar.bz2
+Source0:        %{name}-0.6.0%2Bgit20120606.tar.bz2
+# PATCH-FIX-UPSTREAM lightspark-0.5.7-underlinking.patch lp#1000818 reddwarf@opensuse.org -- Link against GTK
+Patch0:         lightspark-0.5.7-underlinking.patch
+# PATCH-FIX-UPSTREAM lightspark-0.5.7-llvm_31.patch lp#980464 reddwarf@opensuse.org -- Fix build with LLVM 3.1. Took from GIT.
+Patch1:         lightspark-0.5.7-llvm_31.patch
+Patch2:         lightspark-0.5.7-ffmpeg_011.patch
 BuildRequires:  boost-devel
 BuildRequires:  cmake
 BuildRequires:  curl-devel
@@ -39,18 +44,6 @@
 plugin written in C++/C that runs on Linux. It aims to support
 Adobe's newer Flash formats and AVM2 virtual machine.
 
-%package devel
-Summary:        Development libraries for %{name}
-Group:          Development/Libraries/C and C++
-Requires:       %{name} = %{version}-%{release}
-
-%description devel
-Lightspark is an LGPL-3.0+ licensed Flash player and browser
-plugin written in C++/C that runs on Linux. It aims to support
-Adobe's newer Flash formats and AVM2 virtual machine.
-
-Development files for %{name}
-
 %package browser-plugin
 Summary:	This package contains the browser plugin.
 Group:		Multimedia
@@ -82,24 +75,38 @@
 
 %prep
 %setup -q
+%patch0
+%patch1
+%patch2
 
 %build
-cmake -DCOMPILE_PLUGIN=1 \
+export CFLAGS='%{optflags}'
+export CXXFLAGS='%{optflags}'
+mkdir build
+cd build
+cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=1 \
+      -DCMAKE_VERBOSE_MAKEFILE=1 \
       -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-      -DPLUGIN_DIRECTORY="%{_libdir}/browser-plugins/" \
-      -DENABLE_SOUND=1 \
-      -DAUDIO_BACKEND=pulse \
-      -DCMAKE_BUILD_TYPE=Release .
-make VERBOSE=1 %{?_smp_mflags}
-
+      -DLIB_SUFFIX=$(echo %{_lib} | cut -b4-) \
+      -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+      -DPLUGIN_DIRECTORY=%{_libdir}/browser-plugins \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DENABLE_LIBAVCODEC=1 ..
+make %{?_smp_mflags}
 %install
+cd build
 %make_install
+cd ..
+
 # Remove non-standard icon directory
 pushd %{buildroot}%{_datadir}/icons/hicolor
 rm -rf 20x20
 popd
 %suse_update_desktop_file %{buildroot}%{_datadir}/applications/%{name}.desktop
 %find_lang %{name}
+rm -f %{buildroot}%{_libdir}/%{name}/lib%{name}.so
+# Not in hicolor theme (lp#1000840)
+rm -rf %{buildroot}%{_datadir}/icons/hicolor/20x20
 pushd $RPM_BUILD_ROOT%{_datadir}/man/man1
     ln -s %{name}.1.gz tightspark.1.gz
 popd
@@ -107,11 +114,6 @@
 %clean
 %{?buildroot:rm -rf %{buildroot}}
 
-%files devel
-%defattr(-,root,root)
-%dir %{_prefix}/lib/%{name}
-%{_prefix}/lib/%{name}/lib%{name}.so
-
 %files browser-plugin
 %{_libdir}/browser-plugins/lib%{name}plugin.so
 %dir /%{_prefix}/lib/%{name}/plugins/