[xine-ui/el7: 6/6] Merge remote-tracking branch 'origin/master' into el7
by Xavier Bachelot
commit 85d668d21bc61b421d91969e16e59159830550af
Merge: 5f996ef 9118569
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Mon Jan 1 15:04:24 2018 +0100
Merge remote-tracking branch 'origin/master' into el7
.gitignore | 1 +
sources | 2 +-
xine-ui.spec | 37 ++++++++++++++++++++-----------------
3 files changed, 22 insertions(+), 18 deletions(-)
---
6 years, 4 months
[gxine/f26] (2 commits) ...0.5.910 take 2
by Xavier Bachelot
Summary of changes:
c400a00... 0.5.910 (*)
018f13f... 0.5.910 take 2 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 4 months
[gxine/f27] (2 commits) ...0.5.910 take 2
by Xavier Bachelot
Summary of changes:
c400a00... 0.5.910 (*)
018f13f... 0.5.910 take 2 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 4 months
[xine-ui/f27] (3 commits) ...Fix typo
by Xavier Bachelot
Summary of changes:
0d52cd1... 0.99.10 (*)
f307db5... 0.99.10 take 2 (*)
9118569... Fix typo (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 4 months
[xine-ui] Fix typo
by Xavier Bachelot
commit 911856984442f27139f6ab4ef65a97b390937399
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Mon Jan 1 14:32:18 2018 +0100
Fix typo
xine-ui.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/xine-ui.spec b/xine-ui.spec
index aaf3f87..68afc99 100644
--- a/xine-ui.spec
+++ b/xine-ui.spec
@@ -218,7 +218,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f 'xi\(ne-ui\|tk\)'.lang
%license COPYING
-%doc Changelog doc/README*
+%doc ChangeLog doc/README*
%{_bindir}/cacaxine
%{_bindir}/fbxine
%{_bindir}/xine
6 years, 4 months
[gxine] 0.5.910 take 2
by Xavier Bachelot
commit 018f13fb69f05f2f7f89f719610822b3ffcbcc08
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Mon Jan 1 14:09:00 2018 +0100
0.5.910 take 2
gxine.spec | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/gxine.spec b/gxine.spec
index 67b71b7..99a10b3 100644
--- a/gxine.spec
+++ b/gxine.spec
@@ -1,8 +1,7 @@
Name: gxine
-Version: 0.5.909
+Version: 0.5.910
Release: 1%{?dist}
Summary: GTK frontend for the xine multimedia library
-
License: GPLv2+
URL: http://www.xine-project.org/home
Source0: http://downloads.sourceforge.net/xine/%{name}-%{version}.tar.xz
@@ -10,8 +9,6 @@ Source0: http://downloads.sourceforge.net/xine/%{name}-%{version}.tar.xz
Patch1: gxine-0.5.902-non-separate-toolbar.patch
# some multilib issues
Patch3: gxine-0.5.907-lirc.patch
-# HG 2435
-Patch4: gxine-0.5.909-fix_desktop_file.patch
BuildRequires: js-devel
BuildRequires: desktop-file-utils
@@ -34,34 +31,33 @@ BuildRequires: nspr-devel
# for linkage patch
BuildRequires: libtool
+
%description
gxine is a fully-featured free audio/video player for unix-like systems which
-uses libxine for audio/video decoding and playback. For more informations on
+uses libxine for audio/video decoding and playback. For more information on
what formats are supported, please refer to the libxine documentation.
gxine is a gtk based gui for this xine-library alternate to xine-ui.
+
%package mozplugin
Summary: Mozilla plugin for gxine
-Group: Applications/Internet
Requires: %{name} = %{version}-%{release}
Requires: mozilla-filesystem
%description mozplugin
This plugin allows gxine to be embedded in a web browser.
-%prep
+%prep
%setup -q
-
%patch1 -p1 -b .non-separate-toolbar
%patch3 -p1 -b .lirc
-%patch4 -p1 -b .desktopfile
%{__sed} -i 's/Name=gxine/Name=GXine/' gxine.desktop.in
autoreconf -if
-%build
+%build
%configure --with-dbus --with-logo-format=image --with-gudev \
--with-browser-plugin --disable-integration-wizard \
--enable-watchdog --disable-own-playlist-parsers \
@@ -87,6 +83,7 @@ desktop-file-install --delete-original \
--mode 0644 \
%{buildroot}%{_datadir}/applications/%{name}.desktop
+
%post
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -101,7 +98,8 @@ fi
%files -f %{name}.lang
-%doc AUTHORS ChangeLog COPYING README TODO
+%license COPYING
+%doc AUTHORS ChangeLog README TODO
%dir %{_sysconfdir}/gxine/
%config(noreplace) %{_sysconfdir}/gxine/gtk.css
%config(noreplace) %{_sysconfdir}/gxine/gtkrc
@@ -118,10 +116,15 @@ fi
%{_datadir}/applications/*gxine.desktop
%files mozplugin
-%doc COPYING
+%license COPYING
%{_libdir}/mozilla/plugins/gxineplugin.so
+
%changelog
+* Sun Dec 31 2017 Xavier Bachelot <xavier(a)bachelot.org> - 0.5.910-1
+- Update to 0.5.910.
+- Specfile cleanup.
+
* Mon Dec 18 2017 Xavier Bachelot <xavier(a)bachelot.org> - 0.5.909-1
- Update to 0.5.909.
6 years, 4 months
[xine-ui] 0.99.10 take 2
by Xavier Bachelot
commit f307db56a3ede416166c43fda3057a86a35fc4e1
Author: Xavier Bachelot <xavier(a)bachelot.org>
Date: Mon Jan 1 14:08:23 2018 +0100
0.99.10 take 2
sources | 30 ++++++++++++++++++++++++++++++
xine-ui.spec | 31 ++++++++++++++-----------------
2 files changed, 44 insertions(+), 17 deletions(-)
---
diff --git a/sources b/sources
index 88db979..031fd73 100644
--- a/sources
+++ b/sources
@@ -1 +1,31 @@
+ad74c35558588f5d4234449a076b4105 Antares.tar.gz
+61cbcf4cb3f1443a17e96c0a73eeb3a8 Bambino-Black.tar.gz
+56f21a3ffddf0f0980336a5d9cdff179 Bambino-Blue.tar.gz
+4d4ee2d1825896ff6c1dadfbf1f75864 Bambino-Green.tar.gz
+dacd886be4fd9c13dd96fa3b96f3e7f8 Bambino-Orange.tar.gz
+424b4dd516569c92af7d96c10daa46d3 Bambino-Pink.tar.gz
+2e6438459244104e46d89a66e5a1f961 Bambino-Purple.tar.gz
+3e8bc6f6958e8d732b88f2e227f3c879 Bambino-White.tar.gz
+070fd8e3582b6f9e302b595c81dd87e4 Bluton.tar.gz
+159b45f013183aea3038f9133f61cf89 CelomaChrome.tar.gz
+5ac74cb407b59b3487031a0564698e1f CelomaGold.tar.gz
+dadb7b21b8e7e0c40ad7237c4f98906f CelomaMdk.tar.gz
+06f2b0f6ceb9456bc26fae65f4f89a53 Centori.tar.gz
+eb511cd1217bc0c0bd3fa016698adebc Crystal.tar.gz
+c7825e925434374a074c4acc46bcdd4f Galaxy.tar.gz
+0154a3eecbeb995865ead852fd5f6bb2 Keramic.tar.gz
+bff16e879b75bd5a442c0c5c7dc22bcb KeramicRH8.tar.gz
+54b3e28494e1d89e041ceace7db32049 OMS_legacy.tar.gz
+b92dfe59cb5f7bbc495ed0be50c1c132 Polaris.tar.gz
+8702d138eb61b7149118f91121fe846a Sunset.tar.gz
+454bdc7321fc18f0db811db722c2e93c blackslim2.tar.gz
+1ff0ea8d7c73c4f3b32c13a408af3be1 caramel.tar.gz
+432e0d5135be09e03a69f363d3da94a0 cloudy.tar.gz
+34d18380c1077cdf43a04797b2e06734 concept.tar.gz
+d809f2f3cce0eae966296e01ede8df00 gudgreen.tar.gz
+f16d6a1a39b32473a901d9132c405196 lcd.tar.gz
+841924c042ca70700a9d201bc7686e59 mp2k.tar.gz
+3023e8dd6c12902c32b3d99e51fd0c1e mplayer.tar.gz
+7dd4e9e50e0145142982b0537c36f50a pitt.tar.gz
b3b4839c73edfa0da7c7331455cfee29 xine-ui-0.99.10.tar.xz
+9ebf98f4434a9fc119f0282806ba9c32 xinium.tar.gz
diff --git a/xine-ui.spec b/xine-ui.spec
index 71b27d9..aaf3f87 100644
--- a/xine-ui.spec
+++ b/xine-ui.spec
@@ -5,10 +5,9 @@
Summary: A skinned xlib-based gui for xine-lib
Name: xine-ui
-Version: 0.99.9
-Release: 5%{?dist}
+Version: 0.99.10
+Release: 1%{?dist}
License: GPLv2+
-Group: Applications/Multimedia
URL: http://www.xine-project.org/
Source0: http://sourceforge.net/projects/xine/files/xine-ui/%{version}/xine-ui-%{v...
@@ -69,6 +68,7 @@ BuildRequires: curl-devel >= 7.10.2
BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: libcaca-devel
+BuildRequires: libjpeg-turbo-devel
BuildRequires: libpng-devel >= 1.5
BuildRequires: libtermcap-devel
BuildRequires: libXft-devel
@@ -78,15 +78,10 @@ BuildRequires: libXt-devel
BuildRequires: libXtst-devel
BuildRequires: libXv-devel
BuildRequires: libXxf86vm-devel
+BuildRequires: lirc-devel
BuildRequires: readline-devel
BuildRequires: xine-lib-devel >= 1.1.0
BuildRequires: xorg-x11-proto-devel
-BuildRequires: libjpeg-turbo-devel
-
-# lirc-devel is not available on EPEL-5
-%if 0%{?fedora} || 0%{?rhel} >= 6
-BuildRequires: lirc-devel
-%endif
# For dir ownership
Requires: hicolor-icon-theme
@@ -100,14 +95,11 @@ xine-ui is the traditional, skinned GUI for xine-lib.
%package skins
Summary: Extra skins for xine-ui
-Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
# Package used to be named xine-skins
Provides: xine-skins = %{version}-%{release}
Obsoletes: xine-skins < %{version}-%{release}
-%if 0%{?fedora} > 10 || 0%{?rhel} > 5
BuildArch: noarch
-%endif
%description skins
This package contains extra skins for xine-ui.
@@ -115,12 +107,11 @@ This package contains extra skins for xine-ui.
%package aaxine
Summary: ASCII art player for terminals
-Group: Applications/Multimedia
Requires: %{name} = %{version}-%{release}
Requires: xine-lib-extras
%description aaxine
-This package contains the ASCII art player for terminals like the vt100
+This package contains the ASCII art player for terminals like the vt100.
%prep
@@ -226,12 +217,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files -f 'xi\(ne-ui\|tk\)'.lang
-%doc doc/README*
+%license COPYING
+%doc Changelog doc/README*
%{_bindir}/cacaxine
%{_bindir}/fbxine
%{_bindir}/xine
%{_bindir}/xine-remote
-
%dir %{_datadir}/xine/
%dir %{_datadir}/xine/skins/
%{_datadir}/xine/skins/xinetic/
@@ -239,7 +230,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/xine/skins/xine_splash.png
%{_datadir}/xine/oxine/
%{_datadir}/xine/visuals/
-
%{_datadir}/mime/packages/xine-ui.xml
%{_datadir}/applications/*xine.desktop
%{_datadir}/icons/hicolor/*x*/apps/xine.png
@@ -263,7 +253,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%lang(es) %{_mandir}/es/man1/aaxine*
%lang(pl) %{_mandir}/pl/man1/aaxine*
+
%changelog
+* Sun Dec 31 2017 Xavier Bachelot <xavier(a)bachelot.org> - 0.99.10-1
+- Update to 0.99.10.
+- Drop obsolete conditionals.
+- Drop Group: tags.
+- Add %%license and Changelog to %%doc.
+
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.99.9-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
6 years, 4 months