[compiz-manager] redo the patch as it seems a chunk does not apply

Adam Williamson adamwill at fedoraproject.org
Thu Jan 20 00:10:55 UTC 2011


commit 3d4c9f9e7f357b28d0ea40db0c30bd5e8b57eda4
Author: Adam Williamson <awilliam at redhat.com>
Date:   Thu Jan 20 00:10:12 2011 +0000

    redo the patch as it seems a chunk does not apply

 compiz-manager-0.6.0.diff |    5 ++---
 compiz-manager.spec       |    5 ++++-
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/compiz-manager-0.6.0.diff b/compiz-manager-0.6.0.diff
index d480636..aaaf7a5 100644
--- a/compiz-manager-0.6.0.diff
+++ b/compiz-manager-0.6.0.diff
@@ -1,5 +1,5 @@
 --- compiz-manager-0.6.0/compiz-manager	2011-01-19 19:08:08.540834340 +0000
-+++ compiz-manager-0.6.0/compiz-manager.new2	2011-01-19 19:15:11.395063571 +0000
++++ compiz-manager-0.6.0/compiz-manager.new2	2011-01-19 21:48:26.074954285 +0000
 @@ -26,17 +26,20 @@
  # started, and start a default plugin and possibly window decorator.
  # 
@@ -177,8 +177,7 @@
  fi
  
  # get environment
- build_env
-@@ -374,10 +350,17 @@
+@@ -374,10 +351,17 @@
  elif [ -x ${COMPIZ_BIN_PATH}gtk-window-decorator ] && [ -n "$GNOME_DESKTOP_SESSION_ID" ]; then
  	verbose "Starting gtk-window-decorator\n"
  	${COMPIZ_BIN_PATH}gtk-window-decorator --replace &
diff --git a/compiz-manager.spec b/compiz-manager.spec
index 929b951..ff0f85c 100644
--- a/compiz-manager.spec
+++ b/compiz-manager.spec
@@ -1,6 +1,6 @@
 Name:           compiz-manager
 Version:        0.6.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        A wrapper script to start compiz with proper options
 
 Group:          Applications/System
@@ -46,6 +46,9 @@ rm -rf %{buildroot}
 %{_bindir}/compiz-manager
 
 %changelog
+* Wed Jan 19 2011 Adam Williamson <awilliam at redhat.com> - 0.6.0-12
+- redo the patch as it seems like the last chunk is not applying
+
 * Wed Jan 19 2011 Adam Williamson <awilliam at redhat.com> - 0.6.0-11
 - modernization of script:
 	+ drop all the Xgl stuff


More information about the scm-commits mailing list