6:35 a.m.
Author: mooninite
Update of /cvs/free/rpms/kodi/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv368
Modified Files:
.cvsignore kodi-generate-tarball-xz.sh kodi.spec sources
Log Message:
* Fri Jan 30 2015 Michael Cronenworth <mike(a)cchtml.com> - 14.1-1
- Update to 14.1 final
- Fix Obsoletes for -devel
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/kodi/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 30 Dec 2014 14:54:26 -0000 1.2
+++ .cvsignore 31 Jan 2015 06:35:31 -0000 1.3
@@ -1 +1 @@
-kodi-14.0-patched.tar.xz
+kodi-14.1-patched.tar.xz
Index: kodi-generate-tarball-xz.sh
===================================================================
RCS file: /cvs/free/rpms/kodi/devel/kodi-generate-tarball-xz.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kodi-generate-tarball-xz.sh 30 Dec 2014 14:54:27 -0000 1.1
+++ kodi-generate-tarball-xz.sh 31 Jan 2015 06:35:31 -0000 1.2
@@ -1,7 +1,7 @@
#!/bin/sh
MAJORVERSION=14
-MINORVERSION=0
+MINORVERSION=1
#GITCOMMIT=e988513175fccca83f8b688bb77b932f6a403b96
#GITSHORT=ge988513
CODENAME=Helix
Index: kodi.spec
===================================================================
RCS file: /cvs/free/rpms/kodi/devel/kodi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kodi.spec 6 Jan 2015 02:46:26 -0000 1.2
+++ kodi.spec 31 Jan 2015 06:35:31 -0000 1.3
@@ -6,8 +6,8 @@
%global _hardened_build 1
Name: kodi
-Version: 14.0
-Release: 2%{?dist}
+Version: 14.1
+Release: 1%{?dist}
Summary: Media center
License: GPLv2+ and GPLv3+ and LGPLv2+ and BSD and MIT
@@ -216,6 +216,8 @@
Summary: Development files needed to compile C programs against kodi
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
+Obsoletes: xbmc-devel < 14.0
+Provides: xbmc-devel = %{version}
%description devel
Kodi is a free cross-platform media-player jukebox and entertainment hub.
@@ -225,6 +227,8 @@
%package eventclients
Summary: Media center event client remotes
+Obsoletes: xbmc-eventclients < 14.0
+Provides: xbmc-eventclients = %{version}
%description eventclients
This package contains support for using Kodi with the PS3 Remote, the Wii
@@ -234,8 +238,8 @@
Summary: Media center event client remotes development files
Requires: %{name}-eventclients%{?_isa} = %{version}-%{release}
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
-Obsoletes: xbmc-eventclients < 14.0-1
-Provides: xbmc-eventclients = %{version}
+Obsoletes: xbmc-eventclients-devel < 14.0
+Provides: xbmc-eventclients-devel = %{version}
%description eventclients-devel
This package contains the development header files for the eventclients
@@ -359,14 +363,18 @@
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-rmdir %{_libdir}/xbmc %{_datadir}/xbmc
-ln -s kodi ${RPM_BUILD_ROOT}%{_libdir}/xbmc
-ln -s kodi ${RPM_BUILD_ROOT}%{_datadir}/xbmc
+if [ ! -L %{_libdir}/xbmc ] ; then
+ rmdir %{_libdir}/xbmc %{_datadir}/xbmc
+ ln -s kodi ${RPM_BUILD_ROOT}%{_libdir}/xbmc
+ ln -s kodi ${RPM_BUILD_ROOT}%{_datadir}/xbmc
+fi
%posttrans devel
-rmdir %{_includedir}/xbmc
-ln -s kodi ${RPM_BUILD_ROOT}%{_includedir}/xbmc
+if [ ! -L %{_includedir}/xbmc ] ; then
+ rmdir %{_includedir}/xbmc
+ ln -s kodi ${RPM_BUILD_ROOT}%{_includedir}/xbmc
+fi
%files
@@ -416,6 +424,10 @@
%changelog
+* Fri Jan 30 2015 Michael Cronenworth <mike(a)cchtml.com> - 14.1-1
+- Update to 14.1 final
+- Fix Obsoletes for -devel
+
* Mon Jan 05 2015 Michael Cronenworth <mike(a)cchtml.com> - 14.0-2
- Fix xbmc upgrade path
Index: sources
===================================================================
RCS file: /cvs/free/rpms/kodi/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 30 Dec 2014 14:54:27 -0000 1.2
+++ sources 31 Jan 2015 06:35:31 -0000 1.3
@@ -1 +1 @@
-3534c37d3eeb917a5872818a253eee72 kodi-14.0-patched.tar.xz
+8c65fee0ff3cb9786e003fcfa2e5e4cc kodi-14.1-patched.tar.xz