Update to Gotham beta 4, enable clientevents package

3 files changed, 36 insertions, 32 deletions

diff --git a/TODO b/TODO
index ff22774..2905b77 100644
--- a/TODO
+++ b/TODO
@@ -22,9 +22,6 @@
     can't see libmad.so* as a Requires in the built package) , but
     source code should be removed from lib/libmad
 
-* Set the version in the version of XBMC in the "System" menu. I think
-  we can just set the GIT_REV environment variable during the build.
-
 * EL6: Frodo requires taglib 1.8. Red Hat ships taglib 1.6.1 in RHEL. It
   is very unlikely that we will be able to backport support for taglib
   1.6 into newer version of XBMC because the API has changed so much. We
diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh
index 6279916..e6dd854 100755
--- a/xbmc-generate-tarball-xz.sh
+++ b/xbmc-generate-tarball-xz.sh
@@ -2,7 +2,7 @@
 
 MAJORVERSION=13
 MINORVERSION=0
-PRERELEASE=Gotham_beta3
+PRERELEASE=Gotham_beta4
 
 VERSION=${MAJORVERSION}.${MINORVERSION}${PRERELEASE:+-${PRERELEASE}}
 
diff --git a/xbmc.spec b/xbmc.spec
index 3f10a64..2abc712 100644
--- a/xbmc.spec
+++ b/xbmc.spec
@@ -1,4 +1,4 @@
-%global PRERELEASE Gotham_beta3
+%global PRERELEASE Gotham_beta4
 #%%global DIRVERSION %{version}
 # use the line below for pre-releases
 %global DIRVERSION %{version}-%{PRERELEASE}
@@ -6,7 +6,7 @@
 
 Name: xbmc
 Version: 13.0
-Release: 0.12.Gotham_beta3%{?dist}
+Release: 0.13.Gotham_beta4%{?dist}
 Summary: Media center
 
 License: GPLv2+ and GPLv3+
@@ -32,6 +32,9 @@ Patch2: xbmc-13.0-hdhomerun.patch
 # https://bugzilla.redhat.com/1069079
 Patch3: xbmc-13.0-libmysqlclient.patch
 
+# Set program version parameters
+Patch4: xbmc-13.0-versioning.patch
+
 # External ffmpeg patches
 Patch100: 0001-Revert-drop-support-for-external-ffmpeg.patch
 Patch101: 0002-Revert-linux-link-ffmpeg-statically.patch
@@ -212,20 +215,21 @@ entertainment hub. If you want to develop programs which use xbmc's
 libraries, you need to install this package.
 
 
-#%%package eventclients
-#%Summary: Media center event client remotes
+%package eventclients
+Summary: Media center event client remotes
 
-#%%description eventclients
-#%This package contains support for using XBMC with the PS3 Remote, the Wii
-#%Remote, a J2ME based remote and the command line xbmc-send utility.
+%description eventclients
+This package contains support for using XBMC with the PS3 Remote, the Wii
+Remote, a J2ME based remote and the command line xbmc-send utility.
 
-#%%package eventclients-devel
-#%Summary: Media center event client remotes development files
-#%Requires:	%{name}-eventclients = %{version}-%{release}
+%package eventclients-devel
+Summary: Media center event client remotes development files
+Requires:	%{name}-eventclients = %{version}-%{release}
+Requires:	%{name}-devel = %{version}-%{release}
 
-#%%description eventclients-devel
-#%This package contains the development header files for the eventclients
-#%library.
+%description eventclients-devel
+This package contains the development header files for the eventclients
+library.
 
 
 %prep
@@ -234,6 +238,7 @@ libraries, you need to install this package.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %patch100 -p1
 %patch101 -p1
@@ -314,7 +319,7 @@ make %{?_smp_mflags} VERBOSE=1
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
-#make -C tools/EventClients DESTDIR=$RPM_BUILD_ROOT install 
+make -C tools/EventClients DESTDIR=$RPM_BUILD_ROOT install 
 # remove the doc files from unversioned /usr/share/doc/xbmc, they should be in versioned docdir
 rm -r $RPM_BUILD_ROOT/%{_datadir}/doc/
 
@@ -362,24 +367,26 @@ fi
 %{_includedir}/xbmc
 
 
-#%%files eventclients
-#%%defattr(-,root,root)
-#%%python_sitelib/xbmc
-#%%dir %{_datadir}/pixmaps/xbmc
-#%%{_datadir}/pixmaps/xbmc/*.png
-#%%{_bindir}/xbmc-j2meremote
-#%%{_bindir}/xbmc-ps3d
-#%%{_bindir}/xbmc-ps3remote
-#%%{_bindir}/xbmc-send
-#%%{_bindir}/xbmc-wiiremote
+%files eventclients
+%python_sitelib/xbmc
+%dir %{_datadir}/pixmaps/xbmc
+%{_datadir}/pixmaps/xbmc/*.png
+%{_bindir}/xbmc-j2meremote
+%{_bindir}/xbmc-ps3d
+%{_bindir}/xbmc-ps3remote
+%{_bindir}/xbmc-send
+%{_bindir}/xbmc-wiiremote
+
 
-#%%files eventclients-devel
-#%%defattr(-,root,root)
-#%%dir %{_includedir}/xbmc
-#%%{_includedir}/xbmc/xbmcclient.h
+%files eventclients-devel
+%{_includedir}/xbmc/xbmcclient.h
 
 
 %changelog
+* Sun Apr 20 2014 Michael Cronenworth <mike@cchtml.com> - 13.0-0.13.Gotham_beta4
+- Update to Gotham beta 4
+- Enable clientevents package
+
 * Tue Apr 15 2014 Michael Cronenworth <mike@cchtml.com> - 13.0-0.12.Gotham_beta3
 - Update dvdread patch for new dvdread release