Fix patch error because of whitespace in run.sh.

Patch fails one hunk because of a mismatch in whitespace.
Also fixed a warning about changelog date being bogus.

Change-Id: Ie387a77bdc1702e19af0e99cec4157140adeb5b2
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/packaging/rpm/opendaylight-controller.spec b/packaging/rpm/opendaylight-controller.spec
index d1cd48c0e8b0e9178aa16d7edd7b7571f5b96cd7..c65b31e721e99cf961bd4380e3f21a5d3fc4e2c5 100644 (file)
--- a/packaging/rpm/opendaylight-controller.spec
+++ b/packaging/rpm/opendaylight-controller.spec
@@ -3,7 +3,7 @@
 
 Name: opendaylight-controller
 Version: 0.1.0
-Release: 0.7.0%{?dist}
+Release: 0.8.0%{?dist}
 Summary: OpenDaylight SDN Controller
 Group: Applications/Communications
 License: EPL
@@ -273,6 +273,9 @@ fi
 %endif
 
 %changelog
+* Wed Jan 22 2014 Sam Hague <shague@redhat.com> - 0.1.0-0.8.0
+- Fix changelog day error.
+
 * Fri Jan 13 2014 Hsin-Yi Shen <hshen@redhat.com> - 0.1.0-0.7.0
 - Updates to include openflowjava and openflowplugin.
 

diff --git a/packaging/rpm/opendaylight-integration-fix-paths.patch b/packaging/rpm/opendaylight-integration-fix-paths.patch
index d6c61c6c521a47155a7ecab22df32378f587f043..d560796fe058f15218e39953d3fcaa2c212dad36 100644 (file)
--- a/packaging/rpm/opendaylight-integration-fix-paths.patch
+++ b/packaging/rpm/opendaylight-integration-fix-paths.patch
@@ -1,15 +1,15 @@
 diff -uNr opendaylight-integration-0.1.0/distributions/base/src/assemble/resources/run.sh opendaylight-integration-0.1.0p/distributions/base/src/assemble/resources/run.sh
---- opendaylight-integration-0.1.0/distributions/base/src/assemble/resources/run.sh    2014-01-08 22:12:55.000000000 -0500
-+++ opendaylight-integration-0.1.0p/distributions/base/src/assemble/resources/run.sh   2014-01-09 15:53:26.458683536 -0500
+--- opendaylight-integration-0.1.0/distributions/base/src/assemble/resources/run.sh    2014-01-22 17:37:08.000000000 -0500
++++ opendaylight-integration-0.1.0p/distributions/base/src/assemble/resources/run.sh   2014-01-22 17:40:53.706000212 -0500
 @@ -42,4 +42,4 @@
  FILTER=${FILTERBEGINING}${OF_FILTER}${BUNDLEFILTER}${FILTERENDING}
  
  # Run the command
--$CONTROLLER_RUNSH -Dfelix.fileinstall.filter="$FILTER" $NEWARGS 
-+/usr/share/opendaylight-controller/run.internal.sh -Dfelix.fileinstall.filter="$FILTER" $NEWARGS 
+-$CONTROLLER_RUNSH -Dfelix.fileinstall.filter="$FILTER" $NEWARGS
++/usr/share/opendaylight-controller/run.internal.sh -Dfelix.fileinstall.filter="$FILTER" $NEWARGS
 diff -uNr opendaylight-integration-0.1.0/distributions/virtualization/src/assemble/resources/run.sh opendaylight-integration-0.1.0p/distributions/virtualization/src/assemble/resources/run.sh
---- opendaylight-integration-0.1.0/distributions/virtualization/src/assemble/resources/run.sh  2014-01-08 22:12:55.000000000 -0500
-+++ opendaylight-integration-0.1.0p/distributions/virtualization/src/assemble/resources/run.sh 2014-01-09 15:53:46.410725659 -0500
+--- opendaylight-integration-0.1.0/distributions/virtualization/src/assemble/resources/run.sh  2014-01-22 17:37:08.000000000 -0500
++++ opendaylight-integration-0.1.0p/distributions/virtualization/src/assemble/resources/run.sh 2014-01-22 17:40:31.513958423 -0500
 @@ -34,4 +34,4 @@
      fi
  fi