[mpd/f29] Add missing fie
by Leigh Scott
commit f4ec0a3df0f82e363bc80c9b50026845e84f35db
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Oct 25 08:06:32 2018 +0100
Add missing fie
mpd.spec | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/mpd.spec b/mpd.spec
index 23824ce..979a27a 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -189,6 +189,7 @@ fi
%config(noreplace) %{mpd_configfile}
%config(noreplace) %{_sysconfdir}/logrotate.d/mpd
%{_prefix}/lib/tmpfiles.d/mpd.conf
+%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
%defattr(-,%{mpd_user},%{mpd_group})
%dir %{mpd_homedir}
6 years, 1 month
[mpd/f29] Update to 0.20.22
by Leigh Scott
Summary of changes:
959080a... Update to 0.20.22 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 1 month
[mpd] Update to 0.20.22
by Leigh Scott
commit 959080a1efa8d0cc7f028ea76ef46ef75efea1bc
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Oct 25 07:40:11 2018 +0100
Update to 0.20.22
mpd.spec | 30 +++++++++++++++++-------------
sources | 4 ++--
2 files changed, 19 insertions(+), 15 deletions(-)
---
diff --git a/mpd.spec b/mpd.spec
index d5da2de..23824ce 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -16,7 +16,7 @@
Name: mpd
Epoch: 1
-Version: 0.20.21
+Version: 0.20.22
Release: 1%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
@@ -130,31 +130,31 @@ NOCONFIGURE=1 ./autogen.sh
%{make_install}
install -p -D -m 0644 %{SOURCE2} \
- $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/mpd
+ %buildroot%{_sysconfdir}/logrotate.d/mpd
install -p -D -m 0644 %{SOURCE3} \
- $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/mpd.conf
+ %buildroot%{_prefix}/lib/tmpfiles.d/mpd.conf
mkdir -p %{buildroot}/run
install -d -m 0755 %{buildroot}/%{mpd_rundir}
-mkdir -p $RPM_BUILD_ROOT%{mpd_homedir}
-mkdir -p $RPM_BUILD_ROOT%{mpd_logdir}
-mkdir -p $RPM_BUILD_ROOT%{mpd_musicdir}
-mkdir -p $RPM_BUILD_ROOT%{mpd_playlistsdir}
-touch $RPM_BUILD_ROOT%{mpd_dbfile}
-touch $RPM_BUILD_ROOT%{mpd_logfile}
-touch $RPM_BUILD_ROOT%{mpd_statefile}
+mkdir -p %buildroot%{mpd_homedir}
+mkdir -p %buildroot%{mpd_logdir}
+mkdir -p %buildroot%{mpd_musicdir}
+mkdir -p %buildroot%{mpd_playlistsdir}
+touch %buildroot%{mpd_dbfile}
+touch %buildroot%{mpd_logfile}
+touch %buildroot%{mpd_statefile}
-install -D -p -m644 doc/mpdconf.example $RPM_BUILD_ROOT%{mpd_configfile}
+install -D -p -m644 doc/mpdconf.example %buildroot%{mpd_configfile}
sed -i -e "s|#music_directory.*$|music_directory \"%{mpd_musicdir}\"|g" \
-e "s|#playlist_directory.*$|playlist_directory \"%{mpd_playlistsdir}\"|g" \
-e "s|#db_file.*$|db_file \"%{mpd_dbfile}\"|g" \
-e "s|#log_file.*$|log_file \"%{mpd_logfile}\"|g" \
-e "s|#state_file.*$|state_file \"%{mpd_statefile}\"|g" \
-e 's|#user.*$|user "mpd"|g' \
- $RPM_BUILD_ROOT%{mpd_configfile}
+ %buildroot%{mpd_configfile}
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/
+rm -rf %buildroot%{_docdir}/%{name}/
%pre
@@ -202,6 +202,10 @@ fi
%changelog
+* Thu Oct 25 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1:0.20.22-1
+- Update to 0.20.22
+- Switch buildroot macro
+
* Wed Oct 17 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1:0.20.21-1
- Update to 0.20.21
- Remove Group tag
diff --git a/sources b/sources
index e50e622..b821053 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d93c3c86f5e0fc56cc2e1020f80f8b66 mpd-0.20.21.tar.xz
-e506455c501f491d7ae564c4e09c3d8d mpd-0.20.21.tar.xz.sig
+6acee2bc5b30f6c97fdaf46682b0116c mpd-0.20.22.tar.xz
+d75702884c18993fde3d134b930f0d47 mpd-0.20.22.tar.xz.sig
6 years, 1 month
[kodi] (3 commits) ...Fixup versioning
by Nicolas Chauvet
Summary of changes:
d0d7291... Fixup ppc64le already included in powerpc64 (*)
cb1a0e3... Fixup versioning (*)
86568b3... Fixup versioning (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 1 month
[kodi/f29] Fixup versioning
by Nicolas Chauvet
commit 86568b3e9bbdff480b035fa39704cea073b51b6a
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Oct 24 18:54:23 2018 +0200
Fixup versioning
kodi.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/kodi.spec b/kodi.spec
index 57d4c64..30151e2 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -331,7 +331,7 @@ This package contains the Kodi binary for X11 servers.
%prep
%setup -q -n %{name}-%{DIRVERSION}
%patch1 -p1 -b.versioning
-%patch2 -p1 -b.assert
+#patch2 -p1 -b.assert
# Fix up Python shebangs
pathfix.py -pni "%{__python2} %{py2_shbang_opts}" \
tools/EventClients/lib/python/zeroconf.py \
@@ -480,6 +480,7 @@ mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/
%changelog
* Wed Oct 24 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 18.0-0.12.b4
- Update to beta4
+- Fixup versioning
* Sat Oct 20 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 18.0-0.11.b3
- Add BuildRequires lirc-devel (rfbz#5037)
6 years, 1 month
[kodi/f29] Fixup versioning
by Nicolas Chauvet
commit cb1a0e331d26d8e68d994088a73c8deaee4ee9e7
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Oct 24 18:52:55 2018 +0200
Fixup versioning
kodi-18.0-versioning.patch | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/kodi-18.0-versioning.patch b/kodi-18.0-versioning.patch
index 4659968..2f92207 100644
--- a/kodi-18.0-versioning.patch
+++ b/kodi-18.0-versioning.patch
@@ -1,7 +1,8 @@
---- a/xbmc/Application.cpp 2015-12-06 14:30:15.924980306 -0600
-+++ b/xbmc/Application.cpp 2015-12-06 14:37:42.234030771 -0600
-@@ -464,7 +464,7 @@
- CSpecialProtocol::RegisterProfileManager(m_ServiceManager->GetProfileManager());
+diff -up kodi-18.0b4/xbmc/Application.cpp.versioning kodi-18.0b4/xbmc/Application.cpp
+--- kodi-18.0b4/xbmc/Application.cpp.versioning 2018-10-24 18:47:23.616489240 +0200
++++ kodi-18.0b4/xbmc/Application.cpp 2018-10-24 18:52:01.108753960 +0200
+@@ -430,7 +430,7 @@ bool CApplication::Create(const CAppPara
+ init_emu_environ();
CLog::Log(LOGNOTICE, "-----------------------------------------------------------------------");
- CLog::Log(LOGNOTICE, "Starting %s (%s). Platform: %s %s %d-bit", CSysInfo::GetAppName().c_str(), CSysInfo::GetVersion().c_str(),
6 years, 1 month
[kodi/f29] Fixup ppc64le already included in powerpc64
by Nicolas Chauvet
commit d0d729128d47eebd699cc85c4bcac055e9e114da
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Oct 24 18:45:45 2018 +0200
Fixup ppc64le already included in powerpc64
kodi.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/kodi.spec b/kodi.spec
index 0f5546e..57d4c64 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -72,7 +72,7 @@ Patch2: kodi-18a1-assert.patch
%endif
# Upstream does not support ppc64
-ExcludeArch: %{power64} ppc64le
+ExcludeArch: %{power64}
BuildRequires: SDL2-devel
BuildRequires: SDL_image-devel
6 years, 1 month
[kodi] Update to beta4
by Nicolas Chauvet
Summary of changes:
ecb2cb7... Update to beta4 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 1 month
[kodi/f29] Update to beta4
by Nicolas Chauvet
commit ecb2cb77045e0879f5e17ba158871732fa0544d6
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Oct 24 18:33:55 2018 +0200
Update to beta4
kodi-generate-tarball-xz.sh | 2 +-
kodi.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/kodi-generate-tarball-xz.sh b/kodi-generate-tarball-xz.sh
index 2515dd1..6af4f48 100755
--- a/kodi-generate-tarball-xz.sh
+++ b/kodi-generate-tarball-xz.sh
@@ -1,7 +1,7 @@
#!/bin/sh
MAJORVERSION=18
-MINORVERSION=0b3
+MINORVERSION=0b4
#GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96
#GITSHORT=ge988513
CODENAME=Leia
diff --git a/kodi.spec b/kodi.spec
index c4607ae..0f5546e 100644
--- a/kodi.spec
+++ b/kodi.spec
@@ -1,4 +1,4 @@
-%global PRERELEASE b3
+%global PRERELEASE b4
#global DIRVERSION %{version}
#global GITCOMMIT Gotham_r2-ge988513
# use the line below for pre-releases
@@ -30,7 +30,7 @@
Name: kodi
Version: 18.0
-Release: 0.11.b3%{?dist}
+Release: 0.12.b4%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -478,6 +478,9 @@ mv docs/manpages ${RPM_BUILD_ROOT}%{_mandir}/man1/
%changelog
+* Wed Oct 24 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 18.0-0.12.b4
+- Update to beta4
+
* Sat Oct 20 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 18.0-0.11.b3
- Add BuildRequires lirc-devel (rfbz#5037)
diff --git a/sources b/sources
index 49bb169..c79dab3 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
+08c705bfb8a6cd47d08564cbe350161c kodi-18.0b4-patched.tar.xz
2aec5f8c790449126118abc6bb3cb5cd kodi-libdvdnav-6.0.0-Leia-Alpha-3.tar.gz
f3244e7b002d37f91cc6a77461c4f619 kodi-libdvdread-6.0.0-Leia-Alpha-3.tar.gz
-ba776688632a730680ac4be01108446d kodi-18.0b3-patched.tar.xz
6 years, 1 month
[vlc/el7] Adapt patch
by Leigh Scott
commit 6dfa8004fd9f52e5c86c48a7df63595e5747b5ed
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Oct 23 20:58:16 2018 +0100
Adapt patch
vlc-2.2x-fix-upnp.patch | 10 ++++++++++
vlc.spec | 2 ++
2 files changed, 12 insertions(+)
---
diff --git a/vlc-2.2x-fix-upnp.patch b/vlc-2.2x-fix-upnp.patch
index c6efe3c..0209e90 100644
--- a/vlc-2.2x-fix-upnp.patch
+++ b/vlc-2.2x-fix-upnp.patch
@@ -21,3 +21,13 @@ index bdd3c55ee5..82d43632f4 100644
/*
* Compat functions and typedefs for libupnp prior to 1.8
*/
+@@ -74,6 +74,8 @@
+ {
+ return p_s->Sid;
+ }
++#elif UPNP_VERSION < 10800
++typedef void* UpnpEventPtr;
+ #else
+ typedef const void* UpnpEventPtr;
+ #endif
+
diff --git a/vlc.spec b/vlc.spec
index 2f40526..cc1f7c8 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -37,6 +37,8 @@ License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
+# Adapt patch with this addition fix
+# https://github.com/mrjimenez/pupnp/issues/63
Patch0: vlc-2.2x-fix-upnp.patch
BuildRequires: desktop-file-utils
6 years, 1 month