Packman Build Service PMBS

Changes of Revision 86

kodi-noX-raspberry-pi.spec Changed

@@ -40,7 +40,7 @@
 %define kodi_player omxplayer
 
 Name:           kodi-noX-raspberry-pi
-Version:        16.0rc3
+Version:        16.0
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -48,18 +48,12 @@
 Url:            http://kodi.tv/
 Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
 Source1:        kodi.SuSEFirewall2
-# Generated by:
-#   cd xbmc-VERSION
-#   sh ../download_pvr.sh
-Source3:  		kodi-platform-15edaf78d.tar.gz
-Source4:		crossguid-8f399e8bd4.tar.gz
+Source2:        crossguid-8f399e8bd4.tar.gz
 Source10:       kodi.service
 Source11:       kodi-noX.service
 Patch1:         no-xbmc-symbolic-link.patch
-Patch4:         cmake_do_not_download.patch
-Patch5:		cmake_build64.patch
-Patch6:         kodi-texturepacker.patch
-Patch8:			crossguid_build64.patch
+Patch2:         kodi-texturepacker.patch
+Patch3:         crossguid_build64.patch
 BuildRequires:  avahi-devel
 BuildRequires:  boost-devel
 BuildRequires:  byacc
@@ -81,6 +75,9 @@
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  java
 BuildRequires:  libcap-devel
+%ifarch %ix86 x86_64
+BuildRequires:  libcrystalhd-devel
+%endif
 BuildRequires:  libfaac-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libgpg-error-devel
@@ -94,15 +91,15 @@
 BuildRequires:  libyajl-devel
 BuildRequires:  lzo-devel
 BuildRequires:  nasm
-
-
-
 BuildRequires:  readline-devel
 BuildRequires:  shairplay-devel
 #BuildRequires:  sidplay-libs-devel
 BuildRequires:  swig
 BuildRequires:  tinyxml-devel
 BuildRequires:  unzip
+%if !%{noX_build}
+BuildRequires:  xorg-x11-devel
+%endif
 BuildRequires:  yasm
 BuildRequires:  zip
 
@@ -118,7 +115,9 @@
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(fribidi)
+%if %{with enable_opengl}
 BuildRequires:  pkgconfig(glew)
+%endif
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(libass) >= 0.9.7
@@ -127,7 +126,9 @@
 BuildRequires:  pkgconfig(libavfilter) = 5.40.101
 BuildRequires:  pkgconfig(libavformat) = 56.40.101
 BuildRequires:  pkgconfig(libavutil) = 54.31.100
+%if !%{noX_build}
 BuildRequires:  pkgconfig(libbluray)
+%endif
 BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(libcec) >= 3.0.0
 BuildRequires:  pkgconfig(libcurl)
@@ -169,24 +170,12 @@
 BuildRequires:  pkgconfig(udev)
 %endif
 BuildRequires:  pkgconfig(uuid)
+%if %{with enable_opengl}
 BuildRequires:  pkgconfig(vdpau)
+%endif
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  pkgconfig(zlib)
 
-# kodi needs libnfs to access nfs sources, it is not automatically required
-Requires:       libnfs
-# kodi needs the same libtag version which was used to build against
-%requires_eq    libtag1
-%if !%{noX_build}
-BuildRequires:  xorg-x11-devel
-%endif
-%ifarch %ix86 x86_64
-BuildRequires:  libcrystalhd-devel
-%endif
-%if %{with enable_opengl}
-BuildRequires:  pkgconfig(glew)
-BuildRequires:  pkgconfig(vdpau)
-%endif
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
@@ -197,6 +186,11 @@
 %endif
 %endif
 %endif
+
+# kodi needs libnfs to access nfs sources, it is not automatically required
+Requires:       libnfs
+# kodi needs the same libtag version which was used to build against
+%requires_eq    libtag1
 # Manage player deps
 %if %{kodi_player} == "omxplayer"
 Requires:       omxplayer
@@ -243,17 +237,13 @@
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
 %patch1
-%patch4
-%ifarch x86_64
-%patch5
-%endif
-%patch6
-%patch8
+%patch2
+%patch3
 
 # Remove build time references so build-compare can do its work
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
 FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
-for file in xbmc/GUIInfoManager.cpp xbmc/Application.cpp; do
+for file in xbmc/GUIInfoManager.cpp xbmc/Application.cpp xbmc/utils/SystemInfo.cpp; do
   sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
 done
 
@@ -266,21 +256,25 @@
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
     xbmc/linux/*.cpp
 
-cp %{SOURCE4} tools/depends/target/crossguid
+cp %{SOURCE2} tools/depends/target/crossguid
+
 
 %build
 
+# build crossguid
 make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
 		
 chmod +x bootstrap
 ./bootstrap
 
+# add crossguid to INCLUDES and LIBS
 export INCLUDES="-I%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/include"
 export LIBS="-L%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/%{_lib} -lcrossguid -luuid"
 
 %if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
+
 %configure \
     --with-ffmpeg=shared \
     --enable-airplay \
@@ -306,7 +300,6 @@
     --enable-vdpau \
     --enable-gl \
 %else
-    --disable-goom \
     --disable-vaapi \
     --disable-vdpau \
     --disable-gl \
@@ -427,18 +420,12 @@
 %{_kodi_addons_dir}/metadata.common.htbackdrops.com/*
 %dir %{_kodi_addons_dir}/metadata.common.imdb.com/
 %{_kodi_addons_dir}/metadata.common.imdb.com/*
-#%dir %{_kodi_addons_dir}/metadata.common.last.fm/
-#%{_kodi_addons_dir}/metadata.common.last.fm/*
 %dir %{_kodi_addons_dir}/metadata.common.musicbrainz.org/
 %{_kodi_addons_dir}/metadata.common.musicbrainz.org/*
-#%dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com/
-#%{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/metadata.common.themoviedb.org/
 %{_kodi_addons_dir}/metadata.common.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.local/
 %{_kodi_addons_dir}/metadata.local/*
-#%dir %{_kodi_addons_dir}/metadata.musicvideos.theaudiodb.com/
-#%{_kodi_addons_dir}/metadata.musicvideos.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/metadata.themoviedb.org/
 %{_kodi_addons_dir}/metadata.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.tvdb.com/

kodi-noX-raspberry-pi2.spec Changed

@@ -40,7 +40,7 @@
 %define kodi_player omxplayer
 
 Name:           kodi-noX-raspberry-pi2
-Version:        16.0rc3
+Version:        16.0
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -48,18 +48,12 @@
 Url:            http://kodi.tv/
 Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
 Source1:        kodi.SuSEFirewall2
-# Generated by:
-#   cd xbmc-VERSION
-#   sh ../download_pvr.sh
-Source3:  		kodi-platform-15edaf78d.tar.gz
-Source4:		crossguid-8f399e8bd4.tar.gz
+Source2:        crossguid-8f399e8bd4.tar.gz
 Source10:       kodi.service
 Source11:       kodi-noX.service
 Patch1:         no-xbmc-symbolic-link.patch
-Patch4:         cmake_do_not_download.patch
-Patch5:		cmake_build64.patch
-Patch6:         kodi-texturepacker.patch
-Patch8:			crossguid_build64.patch
+Patch2:         kodi-texturepacker.patch
+Patch3:         crossguid_build64.patch
 BuildRequires:  avahi-devel
 BuildRequires:  boost-devel
 BuildRequires:  byacc
@@ -81,6 +75,9 @@
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  java
 BuildRequires:  libcap-devel
+%ifarch %ix86 x86_64
+BuildRequires:  libcrystalhd-devel
+%endif
 BuildRequires:  libfaac-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libgpg-error-devel
@@ -94,15 +91,15 @@
 BuildRequires:  libyajl-devel
 BuildRequires:  lzo-devel
 BuildRequires:  nasm
-
-
-
 BuildRequires:  readline-devel
 BuildRequires:  shairplay-devel
 #BuildRequires:  sidplay-libs-devel
 BuildRequires:  swig
 BuildRequires:  tinyxml-devel
 BuildRequires:  unzip
+%if !%{noX_build}
+BuildRequires:  xorg-x11-devel
+%endif
 BuildRequires:  yasm
 BuildRequires:  zip
 
@@ -118,7 +115,9 @@
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(fribidi)
+%if %{with enable_opengl}
 BuildRequires:  pkgconfig(glew)
+%endif
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(libass) >= 0.9.7
@@ -127,7 +126,9 @@
 BuildRequires:  pkgconfig(libavfilter) = 5.40.101
 BuildRequires:  pkgconfig(libavformat) = 56.40.101
 BuildRequires:  pkgconfig(libavutil) = 54.31.100
+%if !%{noX_build}
 BuildRequires:  pkgconfig(libbluray)
+%endif
 BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(libcec) >= 3.0.0
 BuildRequires:  pkgconfig(libcurl)
@@ -169,24 +170,12 @@
 BuildRequires:  pkgconfig(udev)
 %endif
 BuildRequires:  pkgconfig(uuid)
+%if %{with enable_opengl}
 BuildRequires:  pkgconfig(vdpau)
+%endif
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  pkgconfig(zlib)
 
-# kodi needs libnfs to access nfs sources, it is not automatically required
-Requires:       libnfs
-# kodi needs the same libtag version which was used to build against
-%requires_eq    libtag1
-%if !%{noX_build}
-BuildRequires:  xorg-x11-devel
-%endif
-%ifarch %ix86 x86_64
-BuildRequires:  libcrystalhd-devel
-%endif
-%if %{with enable_opengl}
-BuildRequires:  pkgconfig(glew)
-BuildRequires:  pkgconfig(vdpau)
-%endif
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
@@ -197,6 +186,11 @@
 %endif
 %endif
 %endif
+
+# kodi needs libnfs to access nfs sources, it is not automatically required
+Requires:       libnfs
+# kodi needs the same libtag version which was used to build against
+%requires_eq    libtag1
 # Manage player deps
 %if %{kodi_player} == "omxplayer"
 Requires:       omxplayer
@@ -243,17 +237,13 @@
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
 %patch1
-%patch4
-%ifarch x86_64
-%patch5
-%endif
-%patch6
-%patch8
+%patch2
+%patch3
 
 # Remove build time references so build-compare can do its work
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
 FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
-for file in xbmc/GUIInfoManager.cpp xbmc/Application.cpp; do
+for file in xbmc/GUIInfoManager.cpp xbmc/Application.cpp xbmc/utils/SystemInfo.cpp; do
   sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
 done
 
@@ -266,21 +256,25 @@
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
     xbmc/linux/*.cpp
 
-cp %{SOURCE4} tools/depends/target/crossguid
+cp %{SOURCE2} tools/depends/target/crossguid
+
 
 %build
 
+# build crossguid
 make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
 		
 chmod +x bootstrap
 ./bootstrap
 
+# add crossguid to INCLUDES and LIBS
 export INCLUDES="-I%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/include"
 export LIBS="-L%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/%{_lib} -lcrossguid -luuid"
 
 %if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
+
 %configure \
     --with-ffmpeg=shared \
     --enable-airplay \
@@ -306,7 +300,6 @@
     --enable-vdpau \
     --enable-gl \
 %else
-    --disable-goom \
     --disable-vaapi \
     --disable-vdpau \
     --disable-gl \
@@ -427,18 +420,12 @@
 %{_kodi_addons_dir}/metadata.common.htbackdrops.com/*
 %dir %{_kodi_addons_dir}/metadata.common.imdb.com/
 %{_kodi_addons_dir}/metadata.common.imdb.com/*
-#%dir %{_kodi_addons_dir}/metadata.common.last.fm/
-#%{_kodi_addons_dir}/metadata.common.last.fm/*
 %dir %{_kodi_addons_dir}/metadata.common.musicbrainz.org/
 %{_kodi_addons_dir}/metadata.common.musicbrainz.org/*
-#%dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com/
-#%{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/metadata.common.themoviedb.org/
 %{_kodi_addons_dir}/metadata.common.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.local/
 %{_kodi_addons_dir}/metadata.local/*
-#%dir %{_kodi_addons_dir}/metadata.musicvideos.theaudiodb.com/
-#%{_kodi_addons_dir}/metadata.musicvideos.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/metadata.themoviedb.org/
 %{_kodi_addons_dir}/metadata.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.tvdb.com/

kodi-noX.spec Changed

@@ -40,7 +40,7 @@
 %define kodi_player none
 
 Name:           kodi-noX
-Version:        16.0rc3
+Version:        16.0
 Release:        0
 Summary:        Media center (formerly known as XBMC)
 License:        GPL-2.0+ and GPL-3.0+
@@ -48,18 +48,12 @@
 Url:            http://kodi.tv/
 Source0:        https://github.com/xbmc/xbmc/archive/%{version}-%{kodi_version}.tar.gz
 Source1:        kodi.SuSEFirewall2
-# Generated by:
-#   cd xbmc-VERSION
-#   sh ../download_pvr.sh
-Source3:  		kodi-platform-15edaf78d.tar.gz
-Source4:		crossguid-8f399e8bd4.tar.gz
+Source2:        crossguid-8f399e8bd4.tar.gz
 Source10:       kodi.service
 Source11:       kodi-noX.service
 Patch1:         no-xbmc-symbolic-link.patch
-Patch4:         cmake_do_not_download.patch
-Patch5:		cmake_build64.patch
-Patch6:         kodi-texturepacker.patch
-Patch8:			crossguid_build64.patch
+Patch2:         kodi-texturepacker.patch
+Patch3:         crossguid_build64.patch
 BuildRequires:  avahi-devel
 BuildRequires:  boost-devel
 BuildRequires:  byacc
@@ -81,6 +75,9 @@
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  java
 BuildRequires:  libcap-devel
+%ifarch %ix86 x86_64
+BuildRequires:  libcrystalhd-devel
+%endif
 BuildRequires:  libfaac-devel
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libgpg-error-devel
@@ -94,15 +91,15 @@
 BuildRequires:  libyajl-devel
 BuildRequires:  lzo-devel
 BuildRequires:  nasm
-
-
-
 BuildRequires:  readline-devel
 BuildRequires:  shairplay-devel
 #BuildRequires:  sidplay-libs-devel
 BuildRequires:  swig
 BuildRequires:  tinyxml-devel
 BuildRequires:  unzip
+%if !%{noX_build}
+BuildRequires:  xorg-x11-devel
+%endif
 BuildRequires:  yasm
 BuildRequires:  zip
 
@@ -118,7 +115,9 @@
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(freetype2)
 BuildRequires:  pkgconfig(fribidi)
+%if %{with enable_opengl}
 BuildRequires:  pkgconfig(glew)
+%endif
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(gnutls)
 BuildRequires:  pkgconfig(libass) >= 0.9.7
@@ -127,7 +126,9 @@
 BuildRequires:  pkgconfig(libavfilter) = 5.40.101
 BuildRequires:  pkgconfig(libavformat) = 56.40.101
 BuildRequires:  pkgconfig(libavutil) = 54.31.100
+%if !%{noX_build}
 BuildRequires:  pkgconfig(libbluray)
+%endif
 BuildRequires:  pkgconfig(libcdio)
 BuildRequires:  pkgconfig(libcec) >= 3.0.0
 BuildRequires:  pkgconfig(libcurl)
@@ -169,24 +170,12 @@
 BuildRequires:  pkgconfig(udev)
 %endif
 BuildRequires:  pkgconfig(uuid)
+%if %{with enable_opengl}
 BuildRequires:  pkgconfig(vdpau)
+%endif
 BuildRequires:  pkgconfig(vorbis)
 BuildRequires:  pkgconfig(zlib)
 
-# kodi needs libnfs to access nfs sources, it is not automatically required
-Requires:       libnfs
-# kodi needs the same libtag version which was used to build against
-%requires_eq    libtag1
-%if !%{noX_build}
-BuildRequires:  xorg-x11-devel
-%endif
-%ifarch %ix86 x86_64
-BuildRequires:  libcrystalhd-devel
-%endif
-%if %{with enable_opengl}
-BuildRequires:  pkgconfig(glew)
-BuildRequires:  pkgconfig(vdpau)
-%endif
 %if %{with enable_opengles}
 %if "%{kodi_platform}" == "none"
 BuildRequires:  Mesa-libEGL-devel
@@ -197,6 +186,11 @@
 %endif
 %endif
 %endif
+
+# kodi needs libnfs to access nfs sources, it is not automatically required
+Requires:       libnfs
+# kodi needs the same libtag version which was used to build against
+%requires_eq    libtag1
 # Manage player deps
 %if %{kodi_player} == "omxplayer"
 Requires:       omxplayer
@@ -243,17 +237,13 @@
 %prep
 %setup -q -n xbmc-%{version}-%{kodi_version}
 %patch1
-%patch4
-%ifarch x86_64
-%patch5
-%endif
-%patch6
-%patch8
+%patch2
+%patch3
 
 # Remove build time references so build-compare can do its work
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
 FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M:%%S')
-for file in xbmc/GUIInfoManager.cpp xbmc/Application.cpp; do
+for file in xbmc/GUIInfoManager.cpp xbmc/Application.cpp xbmc/utils/SystemInfo.cpp; do
   sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
 done
 
@@ -266,21 +256,25 @@
     -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
     xbmc/linux/*.cpp
 
-cp %{SOURCE4} tools/depends/target/crossguid
+cp %{SOURCE2} tools/depends/target/crossguid
+
 
 %build
 
+# build crossguid
 make -C tools/depends/target/crossguid PREFIX=$PWD/tools/depends/target/crossguid LIBDIR=%{_lib}
 		
 chmod +x bootstrap
 ./bootstrap
 
+# add crossguid to INCLUDES and LIBS
 export INCLUDES="-I%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/include"
 export LIBS="-L%{_builddir}/xbmc-%{version}-%{kodi_version}/tools/depends/target/crossguid/%{_lib} -lcrossguid -luuid"
 
 %if "%{kodi_platform}" == "raspberry-pi" || "%{kodi_platform}" == "raspberry-pi2"
 export CXXFLAGS="$CXXFLAGS -I%{_includedir}/interface/vcos/pthreads -I%{_includedir}/interface/vmcs_host/linux"
 %endif
+
 %configure \
     --with-ffmpeg=shared \
     --enable-airplay \
@@ -306,7 +300,6 @@
     --enable-vdpau \
     --enable-gl \
 %else
-    --disable-goom \
     --disable-vaapi \
     --disable-vdpau \
     --disable-gl \
@@ -427,18 +420,12 @@
 %{_kodi_addons_dir}/metadata.common.htbackdrops.com/*
 %dir %{_kodi_addons_dir}/metadata.common.imdb.com/
 %{_kodi_addons_dir}/metadata.common.imdb.com/*
-#%dir %{_kodi_addons_dir}/metadata.common.last.fm/
-#%{_kodi_addons_dir}/metadata.common.last.fm/*
 %dir %{_kodi_addons_dir}/metadata.common.musicbrainz.org/
 %{_kodi_addons_dir}/metadata.common.musicbrainz.org/*
-#%dir %{_kodi_addons_dir}/metadata.common.theaudiodb.com/
-#%{_kodi_addons_dir}/metadata.common.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/metadata.common.themoviedb.org/
 %{_kodi_addons_dir}/metadata.common.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.local/
 %{_kodi_addons_dir}/metadata.local/*
-#%dir %{_kodi_addons_dir}/metadata.musicvideos.theaudiodb.com/
-#%{_kodi_addons_dir}/metadata.musicvideos.theaudiodb.com/*
 %dir %{_kodi_addons_dir}/metadata.themoviedb.org/
 %{_kodi_addons_dir}/metadata.themoviedb.org/*
 %dir %{_kodi_addons_dir}/metadata.tvdb.com/

pre_checkin.sh Changed

@@ -1,9 +1,10 @@
 #!/bin/bash
 
+name=kodi
 # Please edit kodi.spec and kodi.changes only. *-noX.* files are generated from kodi.* files with this pre_checkin.sh script
-sed -e 's/%define noX_build 0/%define noX_build 1/g
-	s/^Name:.*kodi/&-noX/' kodi.spec > kodi-noX.spec
-cp kodi.changes kodi-noX.changes
+sed -e "s/%define noX_build 0/%define noX_build 1/g
+	s/^Name:.*$name/&-noX/" $name.spec > $name-noX.spec
+cp $name.changes $name-noX.changes
 
 # Kodi platforms
 armv6_platforms="raspberry-pi"
@@ -17,8 +18,8 @@
 	sed -e "s/%define noX_build 0/%define noX_build 1/g
 	s/%define kodi_platform none/%define kodi_platform $BOARDNAME/g
 	s/%define kodi_player none/%define kodi_player omxplayer/g
-	s/^Name:.*kodi/&-noX-$BOARDNAME/" kodi.spec > kodi-noX-$BOARDNAME.spec
-	cp kodi.changes kodi-noX-$BOARDNAME.changes
+	s/^Name:.*$name/&-noX-$BOARDNAME/" $name.spec > $name-noX-$BOARDNAME.spec
+	cp $name.changes $name-noX-$BOARDNAME.changes
 done
 
 for BOARDNAME in $armv7_platforms; do
@@ -27,8 +28,8 @@
 	sed -e "s/%define noX_build 0/%define noX_build 1/g
 	s/%define kodi_platform none/%define kodi_platform $BOARDNAME/g
 	s/%define kodi_player none/%define kodi_player omxplayer/g
-	s/^Name:.*kodi/&-noX-$BOARDNAME/" kodi.spec > kodi-noX-$BOARDNAME.spec
-	cp kodi.changes kodi-noX-$BOARDNAME.changes
+	s/^Name:.*$name/&-noX-$BOARDNAME/" $name.spec > $name-noX-$BOARDNAME.spec
+	cp $name.changes $name-noX-$BOARDNAME.changes
 done
 
 # Disable format_spec_file for now since it changes header