Request 1545 (accepted)

kodi-noX.changes Changed

kodi.changes Changed

kodi-noX.spec Changed

@@ -223,14 +223,24 @@
 ./bootstrap
 popd
 
-cp %{SOURCE2} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_archive_name}.tar.gz
+#cp %{SOURCE2} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_archive_name}.tar.gz
 
 # 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 tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_archive_name}/ffprobe.c tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_archive_name}/cmdutils.c; do
-#  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
-#done
+
+# remove it in ffmpeg archive and repackage it
+tar xpfz %{SOURCE2} -C tools/depends/target/ffmpeg/
+for file in tools/depends/target/ffmpeg/FFmpeg-%{ffmpeg_archive_name}/ffprobe.c tools/depends/target/ffmpeg/FFmpeg-%{ffmpeg_archive_name}/cmdutils.c; do
+  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
+done
+tar cpfz tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_archive_name}.tar.gz -C tools/depends/target/ffmpeg/ FFmpeg-%{ffmpeg_archive_name}/
+rm -r tools/depends/target/ffmpeg/FFmpeg-%{ffmpeg_archive_name}
+
+# remove the remaining occurencies in the source tree
+for file in lib/timidity/timidity/speex_a.c xbmc/Application.cpp xbmc/GUIInfoManager.cpp; do
+  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
+done
 
 chmod +x bootstrap
 ./bootstrap

kodi.spec Changed

@@ -223,14 +223,24 @@
 ./bootstrap
 popd
 
-cp %{SOURCE2} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_archive_name}.tar.gz
+#cp %{SOURCE2} tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_archive_name}.tar.gz
 
 # 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 tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_archive_name}/ffprobe.c tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_archive_name}/cmdutils.c; do
-#  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
-#done
+
+# remove it in ffmpeg archive and repackage it
+tar xpfz %{SOURCE2} -C tools/depends/target/ffmpeg/
+for file in tools/depends/target/ffmpeg/FFmpeg-%{ffmpeg_archive_name}/ffprobe.c tools/depends/target/ffmpeg/FFmpeg-%{ffmpeg_archive_name}/cmdutils.c; do
+  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
+done
+tar cpfz tools/depends/target/ffmpeg/ffmpeg-%{ffmpeg_archive_name}.tar.gz -C tools/depends/target/ffmpeg/ FFmpeg-%{ffmpeg_archive_name}/
+rm -r tools/depends/target/ffmpeg/FFmpeg-%{ffmpeg_archive_name}
+
+# remove the remaining occurencies in the source tree
+for file in lib/timidity/timidity/speex_a.c xbmc/Application.cpp xbmc/GUIInfoManager.cpp; do
+  sed -i -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" $file
+done
 
 chmod +x bootstrap
 ./bootstrap

Overview

Request 1545 (accepted)

Request History