Request 1970 (accepted)

Overview

Request 1970 (accepted)

- Fix build of vfs_zip plugin.
- Rename deadbeef-restricted-plugins to deadbeef-plugins-extra.
- Move locales to deadbeef-lang package.
- Move documentation to a proper directory.

Created by XRevan86 over 9 years ago
In state accepted
Package maintainer: XRevan86

Submit deadbeef

Submit package home:XRevan86 / deadbeef to package Multimedia / deadbeef

deadbeef.changes Changed

deadbeef.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package deadbeef
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,126 +15,120 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
 
 %bcond_with restricted
-
 Name:           deadbeef
 Version:        0.6.2
-Release:        1.0
-Summary:        GTK2 audio player
-Group:          Productivity/Multimedia/Sound/Players
+Release:        0
+Summary:        GTK+ audio player
 License:        Zlib
+Group:          Productivity/Multimedia/Sound/Players
 Url:            http://deadbeef.sourceforge.net/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        https://downloads.sourceforge.net/project/deadbeef/deadbeef-%version.tar.bz2
-Patch1:         deadbeef-0.6.2-fix_ubuntu_unity_desktop.patch
-
-# E: deadbeef stringcompare widgets.c:1004, 1037
-BuildConflicts: post-build-checks
+Source:         http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2
+# PATCH-FIX-OPENSUSE deadbeef-0.6.2-fix_ubuntu_unity_desktop.patch i@marguerite.su -- Fix Unity-oriented desktop-file warnings.
+Patch0:         deadbeef-0.6.2-fix_ubuntu_unity_desktop.patch
 #!BuildIgnore:  raspberrypi-userland
 BuildRequires:  alsa-devel
-%if 0%{?suse_version} >= 1210
-Buildrequires:  gtk3-devel
-%else
-BuildRequires:  gtk2-devel
-%endif
-BuildRequires:  libcurl-devel
-BuildRequires:  libsamplerate-devel
-BuildRequires:  libvorbis-devel
-BuildRequires:  flac-devel
-BuildRequires:  libcddb-devel
-BuildRequires:  libcdio-devel
-BuildRequires:  libsndfile-devel
-BuildRequires:  wavpack-devel
 BuildRequires:  dbus-1-devel
+BuildRequires:  flac-devel
 BuildRequires:  gcc-c++
-BuildRequires:  libnotify-devel
-BuildRequires:  libpulse-devel
-BuildRequires:  pkg-config
-BuildRequires:  xorg-x11-libs
+BuildRequires:  hicolor-icon-theme
 BuildRequires:  imlib2-devel
 BuildRequires:  intltool
+BuildRequires:  libcddb-devel
+BuildRequires:  libcdio-devel
+BuildRequires:  libcurl-devel
 BuildRequires:  libjpeg-devel
+BuildRequires:  libnotify-devel
+BuildRequires:  libpulse-devel
+BuildRequires:  libsamplerate-devel
+BuildRequires:  libsndfile-devel
+BuildRequires:  libvorbis-devel
 BuildRequires:  libzip-devel
 BuildRequires:  update-desktop-files
+BuildRequires:  wavpack-devel
+BuildRequires:  xorg-x11-libs
 BuildRequires:  yasm
-%if 0%{?sles_version}
-BuildRequires:	xorg-x11-libxcb-devel
+Recommends:     %{name}-lang = %{version}
+Recommends:     %{name}-plugins-extra = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+# E: deadbeef stringcompare widgets.c:1004, 1037
+BuildConflicts: post-build-checks
+%if 0%{?suse_version} >= 1210
+BuildRequires:  gtk3-devel
+%else
+BuildRequires:  gtk2-devel
+%endif
+%if 0%{?suse_version} <= 1140
+BuildRequires:  xorg-x11-libxcb-devel
 %endif
-
 %if %{with restricted}
 BuildRequires:  libfaad-devel
 BuildRequires:  libffmpeg-devel
-BuildRequires:   libmad-devel
+BuildRequires:  libmad-devel
 %endif
 
 %description
-DeaDBeeF is an audio player for GNU/Linux and other UNIX-like systems.
-It is written in C with some plugins in C++. It has minimal dependencies,
-a native GTK2 GUI, cuesheet support, support for MP3, Ogg, FLAC, and APE,
-chiptune formats with subtunes, song-length databases, and more.
-It is very fast and lightweight, and extensible using plugins
-(DSP, GUI, output, input, etc.). The GUI looks similar to Foobar2000.
+DeaDBeeF is an audio player for GNU/Linux and other UNIX-like
+systems. It is written in C with some plugins in C++. DeaDBeeF has
+minimal dependencies for a native GTK+ GUI, cuesheet support,
+support for MP3, Ogg, FLAC, and APE, chiptune formats with subtunes,
+song-length databases, and more.
+It is very fast, lightweight, and extensible using plugins (DSP,
+GUI, output, input, etc.). The GUI looks similar to Foobar2000.
 
-%if %{with restricted}
+%lang_package
 
-%package 	restricted-plugins
+%if %{with restricted}
+%package 	plugins-extra
+Summary:        Extra plugins for DeaDBeeF
 License:        Zlib and GPL-2.0+ and LGPL-2.1+ and BSD-3-Clause and Unicode
-Summary:        Restricted plugins Support for %{name}
 Group:          Productivity/Multimedia/Sound/Players
 Requires:       %{name} = %{version}
+Obsoletes:      %{name}-restricted-plugins < %{version}
+Provides:       %{name}-restricted-plugins = %{version}
 
-%description restricted-plugins
-XMMS2 is an audio framework, but it is not a general multimedia player - it
-will not play videos. It has a modular framework and plugin architecture for
-audio processing, visualisation and output, but this framework has not been
-designed to support video. Also the client-server design of XMMS2 (and the
-daemon being independent of any graphics output) practically prevents direct
-video output being implemented. It has support for a wide range of audio
-formats, which is expandable via plugins. It includes a basic CLI interface
-to the XMMS2 framework, but most users will want to install a graphical XMMS2
-client (such as gxmms2 or esperanza).
+%description plugins-extra
+Extra plugins for DeaDBeeF audio player.
 %endif
 
 %package devel
+Summary:        Development files for %{name}
 License:        Zlib
 Group:          Development/Libraries/C and C++
-Summary:        Devel files for %name
+Requires:       %{name} = %{version}
 Requires:       pkg-config
-Requires:       %name
 
 %description devel
-This package provides headers to develop deadbeef plugins
+This package provides headers for DeaDBeeF plugins development.
 
 %prep
 %setup -q
-%patch1
+%patch0
+sed -i 's/zip_file_t/db_zip_file_t/g' plugins/vfs_zip/vfs_zip.c
 
 %build
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-CFGOPT="--enable-static=no"
+export CFLAGS="%{optflags} -fno-strict-aliasing"
+export CXXFLAGS="%{optflags} -fno-strict-aliasing"
+opts="--enable-static=no"
+%configure \
+  --disable-static             \
 %if 0%{?suse_version} >= 1210
-CFGOPT="$CFGOPT --enable-gtk3 --disable-gtk2"
+  --enable-gtk3 --disable-gtk2 \
 %endif
 %if %{with restricted}
-CFGOPT="$CFGOPT --enable-ffmpeg"
+  --enable-ffmpeg              \
 %endif
-%configure $CFGOPT
-%__make %{?jobs:-j%{jobs}}
+  --docdir=%{_docdir}/%{name}/
+make %{?_smp_mflags}
 
 %install
-%makeinstall
-%suse_update_desktop_file %name
-%__rm %buildroot/%_libdir/deadbeef/*.la
-%find_lang %name
-
-%clean
-%__rm -rf $RPM_BUILD_ROOT
-
-%if 0%{?suse_version} >= 1140
+%make_install
+%suse_update_desktop_file %{name}
+find %{buildroot} -type f -name "*.la" -delete -print
+%find_lang %{name}
 
+%if 0%{?suse_version} > 1140
 %post
 %desktop_database_post
 %icon_theme_cache_post
@@ -144,76 +138,69 @@
 %icon_theme_cache_postun
 %endif
 
-%files -f %name.lang
+%files
+%defattr(-,root,root)
+%doc %{_docdir}/%{name}/
+%{_bindir}/%{name}
+%dir %{_libdir}/%{name}/
+%{_libdir}/%{name}/adplug.so*
+%{_libdir}/%{name}/alsa.so*
+%{_libdir}/%{name}/artwork.so*
+%{_libdir}/%{name}/cdda.so*
+%{_libdir}/%{name}/ffap.so*
+%{_libdir}/%{name}/flac.so*
+%{_libdir}/%{name}/gme.so*
+%{_libdir}/%{name}/hotkeys.so*
+%{_libdir}/%{name}/lastfm.so*
+%{_libdir}/%{name}/notify.so*
+%{_libdir}/%{name}/nullout.so*
+%{_libdir}/%{name}/oss.so*
+%{_libdir}/%{name}/pulse.so*
+%{_libdir}/%{name}/sid.so*
+%{_libdir}/%{name}/sndfile.so*
+%{_libdir}/%{name}/supereq.so*
+%{_libdir}/%{name}/vfs_curl.so*
+%{_libdir}/%{name}/vorbis.so*
+%{_libdir}/%{name}/vtx.so*
+%{_libdir}/%{name}/wavpack.so*
+%{_libdir}/%{name}/wma.so*
+%{_libdir}/%{name}/dca.so*
+%{_libdir}/%{name}/mms.so*
+%{_libdir}/%{name}/musepack.so*
+%{_libdir}/%{name}/shellexec.so*
+%{_libdir}/%{name}/tta.so*
+%{_libdir}/%{name}/wildmidi.so*
+%{_libdir}/%{name}/converter.so*
+%{_libdir}/%{name}/dsp_libsrc.so*
+%{_libdir}/%{name}/m3u.so*
+%{_libdir}/%{name}/vfs_zip.so*
+%{_libdir}/%{name}/ddb_ao.so*
+%{_libdir}/%{name}/ddb_dumb.so*
+%{_libdir}/%{name}/ddb_mono2stereo.so*
+%{_libdir}/%{name}/ddb_shn.so*
+%{_libdir}/%{name}/alac.so*
+%{_libdir}/%{name}/converter_gtk?.so*
+%{_libdir}/%{name}/ddb_gui_GTK?.so*
+%{_libdir}/%{name}/pltbrowser_gtk?.so*
+%{_libdir}/%{name}/shellexecui_gtk?.so*
+%{_libdir}/%{name}/convpresets/
+%{_datadir}/%{name}/
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
+
+%files lang -f %{name}.lang
 %defattr(-,root,root)
-%_bindir/%name
-%dir %_libdir/%name
-%_libdir/%name/adplug.so*
-%_libdir/%name/alsa.so*
-%_libdir/%name/artwork.so*
-%_libdir/%name/cdda.so*
-%_libdir/%name/ffap.so*
-%_libdir/%name/flac.so*
-%_libdir/%name/gme.so*
-%_libdir/%name/hotkeys.so*
-%_libdir/%name/lastfm.so*
-%_libdir/%name/notify.so*
-%_libdir/%name/nullout.so*
-%_libdir/%name/oss.so*
-%_libdir/%name/pulse.so*
-%_libdir/%name/sid.so*
-%_libdir/%name/sndfile.so*
-%_libdir/%name/supereq.so*
-%_libdir/%name/vfs_curl.so*
-%_libdir/%name/vorbis.so*
-%_libdir/%name/vtx.so*
-%_libdir/%name/wavpack.so*
-%_libdir/%name/wma.so*
-%_libdir/%name/dca.so*
-%_libdir/%name/mms.so*
-%_libdir/%name/musepack.so*
-%_libdir/%name/shellexec.so*
-%_libdir/%name/tta.so*
-%_libdir/%name/wildmidi.so*
-%_libdir/%name/converter.so*
-%_libdir/%name/dsp_libsrc.so*
-%_libdir/%name/m3u.so*
-%_libdir/%name/vfs_zip.so*
-%_libdir/%name/ddb_ao.so*
-%_libdir/%name/ddb_dumb.so*
-%_libdir/%name/ddb_mono2stereo.so*
-%_libdir/%name/ddb_shn.so*
-%_libdir/%name/alac.so*
-%if 0%{?suse_version} >= 1210
-%_libdir/%name/converter_gtk3.so*
-%_libdir/%name/ddb_gui_GTK3.so*
-%_libdir/%name/pltbrowser_gtk3.so*
-%_libdir/%name/shellexecui_gtk3.so*
-%else
-%_libdir/%name/converter_gtk2.so*
-%_libdir/%name/ddb_gui_GTK2.so*
-%_libdir/%name/pltbrowser_gtk2.so*
-%_libdir/%name/shellexecui_gtk2.so*
-%endif
-%_datadir/%name
-%_datadir/applications/deadbeef.desktop
-%_datadir/icons/hicolor/*x*/apps/%name.png
-%_datadir/icons/hicolor/scalable/apps/%name.svg
-%_datadir/doc/%name
-%dir %_libdir/%name/convpresets
-%_libdir/%name/convpresets/*.txt
 
 %if %{with restricted}
-
-%files restricted-plugins
-%defattr(-,root,root,-)
-%_libdir/deadbeef/aac.so*
-%_libdir/deadbeef/ffmpeg.so*
-%_libdir/deadbeef/mpgmad.so*
+%files plugins-extra
+%defattr(-,root,root)
+%{_libdir}/deadbeef/aac.so*
+%{_libdir}/deadbeef/ffmpeg.so*
+%{_libdir}/deadbeef/mpgmad.so*
 %endif
 
 %files devel
 %defattr(-,root,root)
-%_includedir/%name
+%{_includedir}/%{name}/
 
 %changelog

_service Deleted

deadbeef-0.6.2.tar.bz2 Added

Build Results
RPM Lint

Refresh

Comments for request 1970 1

XRevan86 wrote over 9 years ago

add_role, package needs a maintainer.

Request History

XRevan86 created request over 9 years ago

- Fix build of vfs_zip plugin.
- Rename deadbeef-restricted-plugins to deadbeef-plugins-extra.
- Move locales to deadbeef-lang package.
- Move documentation to a proper directory.

olh accepted request over 9 years ago