Hello community,
here is the log from the commit of package xine-ui for openSUSE:Factory checked
in at 2017-04-24 09:48:58
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xine-ui (Old)
and /work/SRC/openSUSE:Factory/.xine-ui.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xine-ui"
Mon Apr 24 09:48:58 2017 rev:34 rq:489536 version:0.99.9
Changes:
--------
--- /work/SRC/openSUSE:Factory/xine-ui/xine-ui.changes 2015-04-21
10:54:07.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.xine-ui.new/xine-ui.changes 2017-04-24
09:48:59.818148182 +0200
@@ -1,0 +2,5 @@
+Thu Apr 20 06:57:38 UTC 2017 - davejpla...@gmail.com
+
+- Fix desktop file with xine-ui-desktop.patch
+
+-------------------------------------------------------------------
New:
----
xine-ui-desktop.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xine-ui.spec ++++++
--- /var/tmp/diff_new_pack.Foexub/_old 2017-04-24 09:49:00.814007333 +0200
+++ /var/tmp/diff_new_pack.Foexub/_new 2017-04-24 09:49:00.818006767 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xine-ui
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -22,9 +22,10 @@
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: curl-devel
+BuildRequires: fdupes
BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
-BuildRequires: libxine-devel
+BuildRequires: pkgconfig(libpng12)
+BuildRequires: pkgconfig(libxine)
%if !%{with distributable}
BuildRequires: libxine2-codecs
%endif
@@ -32,6 +33,7 @@
BuildRequires: readline-devel
BuildRequires: update-desktop-files
BuildRequires: xorg-x11-devel
+BuildRequires: pkgconfig(caca)
Summary: Video player with plugins
License: GPL-2.0+ and SUSE-Public-Domain
Group: Productivity/Multimedia/Video/Players
@@ -50,6 +52,8 @@
Source99: baselibs.conf
# *** xine-lib: Bugfixes
Patch0: xine-ui-various.diff
+#PATCH_FIX-OPENSUSE xine-ui-desktop.patch davejpla...@gmail.com - remove
desktop file errors
+Patch1: xine-ui-desktop.patch
Patch2: xine-ui-lirc.diff
Patch22: xine-ui-rpmlintrc.diff
# *** SUSE only changes
@@ -78,6 +82,7 @@
%patch22 -p1
%patch50 -p1
%patch60
+%patch1
install -m 0644 %SOURCE1 misc/splash-default/xine-ui_logo.png
install -m 0644 %SOURCE2 misc/splash-default/xine-ui_logo-crippled.png
%ifarch x86_64
@@ -86,10 +91,19 @@
%endif
%build
-export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+%if 1 == 0
+%define gcc_version 7
+export CC=gcc-7
+export CPP=cpp-7
+export CXX=g++-7
+%endif
+export CFLAGS="%{optflags} -fno-strict-aliasing"
+%if 0%{?gcc_version} > 5
+export CFLAGS="$CFLAGS -Werror=date-time"
+%endif
# ignore nonupdated automake+co files
rm -f missing ; touch missing
-export XINE_DOCPATH=/usr/share/doc/packages/xine-ui
+export XINE_DOCPATH=%{_datadir}/doc/packages/xine-ui
NO_CONFIGURE=1 ./autogen.sh
@@ -97,27 +111,33 @@
--enable-vdr-keys \
--with-pic \
--disable-static
-make %{?jobs:-j%jobs}
+make %{_smp_mflags} V=1
%install
-make install DESTDIR=$RPM_BUILD_ROOT
-install -d -m755 $RPM_BUILD_ROOT%{_defaultdocdir}
-mv $RPM_BUILD_ROOT/usr/share/doc/xitk $RPM_BUILD_ROOT%{_defaultdocdir}/xine-ui
-mkdir -p $RPM_BUILD_ROOT/usr/share/applications/
-rm -rf $RPM_BUILD_ROOT/usr/share/xine/desktop
-install -m 0644 %SOURCE2
$RPM_BUILD_ROOT/usr/share/xine/skins/xine-ui_logo-crippled.png
+make install DESTDIR=%{buildroot}
+install -d -m755 %{buildroot}%{_defaultdocdir}
+mv %{buildroot}%{_datadir}/doc/xitk %{buildroot}%{_defaultdocdir}/xine-ui
+mkdir -p %{buildroot}%{_datadir}/applications/
+rm -rf %{buildroot}%{_datadir}/xine/desktop
+install -m 0644 %SOURCE2
%{buildroot}%{_datadir}/xine/skins/xine-ui_logo-crippled.png
# extra skins
-install -d -m755 %buildroot/usr/share/xine/skins/
+install -d -m755 %{buildroot}%{_datadir}/xine/skins/
for i in %SOURCE11 %SOURCE12 %SOURCE13 ; do
- tar xfvj $i -C %buildroot/usr/share/xine/skins/
+ tar xfvj $i -C %buildroot%{_datadir}/xine/skins/
done
#
-%suse_update_desktop_file -i xine AudioVideo Player Video
%find_lang %{name}
%find_lang xitk %{name}.lang
+%fdupes -s %{buildroot}%{_mandir}
+%fdupes -s %{buildroot}%{_datadir}/xine
-%clean
-rm -rf $RPM_BUILD_ROOT
+%post
+%mime_database_post
+%desktop_database_post
+
+%postun
+%mime_database_postun
+%desktop_database_postun
%files -f %{name}.lang
%defattr(-,root,root,0755)
@@ -131,33 +151,34 @@
%doc %_mandir/man1/xine.1.gz
%doc %_mandir/man1/xine-check.1.gz
%doc %_mandir/man1/xine-remote.1.gz
-/usr/bin/aaxine
-/usr/bin/fbxine
-/usr/bin/xine
-/usr/bin/xine-check
-/usr/bin/xine-remote
-%dir /usr/share/icons/hicolor
-%dir /usr/share/icons/hicolor/*
-%dir /usr/share/icons/hicolor/*/apps
-/usr/share/icons/hicolor/*/apps/xine.png
-%dir /usr/share/xine
-%dir /usr/share/xine/skins
-/usr/share/xine/skins/xine-ui_logo.png
-/usr/share/xine/skins/xine-ui_logo-crippled.png
-/usr/share/xine/skins/xine_splash.png
-/usr/share/xine/skins/xinetic
-/usr/share/xine/skins/CelomaChrome
-/usr/share/xine/skins/caramel
-/usr/share/xine/skins/lcd
-%dir /usr/share/xine/visuals
-/usr/share/xine/visuals/default.mpv
-/usr/share/applications/xine.desktop
-/usr/share/xine/oxine
-/usr/share/pixmaps/*
-/usr/share/mime/packages/xine-ui.xml
+%{_bindir}/aaxine
+%{_bindir}/fbxine
+%{_bindir}/xine
+%{_bindir}/xine-check
+%{_bindir}/xine-remote
+%{_bindir}/cacaxine
+%dir %{_datadir}/icons/hicolor
+%dir %{_datadir}/icons/hicolor/*
+%dir %{_datadir}/icons/hicolor/*/apps
+%{_datadir}/icons/hicolor/*/apps/xine.png
+%dir %{_datadir}/xine
+%dir %{_datadir}/xine/skins
+%{_datadir}/xine/skins/xine-ui_logo.png
+%{_datadir}/xine/skins/xine-ui_logo-crippled.png
+%{_datadir}/xine/skins/xine_splash.png
+%{_datadir}/xine/skins/xinetic
+%{_datadir}/xine/skins/CelomaChrome
+%{_datadir}/xine/skins/caramel
+%{_datadir}/xine/skins/lcd
+%dir %{_datadir}/xine/visuals
+%{_datadir}/xine/visuals/default.mpv
+%{_datadir}/applications/xine.desktop
+%{_datadir}/xine/oxine
+%{_datadir}/pixmaps/*
+%{_datadir}/mime/packages/xine-ui.xml
%_defaultdocdir/xine-ui
%doc %_mandir/*/man1/xine-bugreport.1.gz
%doc %_mandir/man1/xine-bugreport.1.gz
-/usr/bin/xine-bugreport
+%{_bindir}/xine-bugreport
%changelog
++++++ xine-ui-desktop.patch ++++++
Index: misc/desktops/xine.desktop.in
===================================================================
--- misc/desktops/xine.desktop.in.orig 2010-04-07 17:36:46.000000000 +0200
+++ misc/desktops/xine.desktop.in 2017-04-19 19:52:52.693771312 +0200
@@ -1,10 +1,9 @@
[Desktop Entry]
-Encoding=UTF-8
Name=xine
Comment=Video Player
Exec=xine %U
Icon=xine
Terminal=false
Type=Application
-Categories=Application;AudioVideo;Player;
-MimeType=x-content/video-dvd;x-content/audio-cdda;x-content/video-vcd;x-content/video-svcd;
\ No newline at end of file
+Categories=AudioVideo;Player;
+MimeType=
\ No newline at end of file
