cleanup spec

Change-Id: Icc729f78c99ffb13cf906836af56e10769b6aae2

diff --git a/packaging/completion-wordbreaks.diff b/packaging/completion-wordbreaks.diff
deleted file mode 100644 (file)
index 7dc112a..0000000
--- a/packaging/completion-wordbreaks.diff
+++ /dev/null
@@ -1,23 +0,0 @@
----
- contrib/completion/git-completion.bash |   10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
---- a/contrib/completion/git-completion.bash
-+++ b/contrib/completion/git-completion.bash
-@@ -77,10 +77,12 @@
-       autoload -U +X bashcompinit && bashcompinit
- fi
- 
--case "$COMP_WORDBREAKS" in
--*:*) : great ;;
--*)   COMP_WORDBREAKS="$COMP_WORDBREAKS:"
--esac
-+# SUSE-specific: We trust the system is consistent and do not let individual
-+# scripts play ping-pong with the global $COMP_WORDBREAKS value.
-+#case "$COMP_WORDBREAKS" in
-+#*:*) : great ;;
-+#*)   COMP_WORDBREAKS="$COMP_WORDBREAKS:"
-+#esac
- 
- # __gitdir accepts 0 or 1 arguments (i.e., location)
- # returns location of .git repo

diff --git a/packaging/git-nohardlink.diff b/packaging/git-nohardlink.diff
deleted file mode 100644 (file)
index f898205..0000000
--- a/packaging/git-nohardlink.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-don't use hardlinks as our .spec calls fdupes which converts the
-hardlinks to symlinks again in an unpredicatable way
----
- Makefile |    1 -
- 1 file changed, 1 deletion(-)
-
---- a/Makefile
-+++ b/Makefile
-@@ -2252,7 +2252,6 @@
-       done && \
-       for p in $(BUILT_INS); do \
-               $(RM) "$$execdir/$$p" && \
--              ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
-               ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
-               cp "$$execdir/git$X" "$$execdir/$$p" || exit; \
-       done && \

diff --git a/packaging/git-prevent_xss-default.diff b/packaging/git-prevent_xss-default.diff
deleted file mode 100644 (file)
index 4069efc..0000000
--- a/packaging/git-prevent_xss-default.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Jakub Narebski <jnareb@...il.com>
-Subject: [PATCH] gitweb: Enable $prevent_xss by default
-
-This fixes issue CVE-2011-2186 originally reported in
-https://launchpad.net/bugs/777804
-
-Reported-by: dave b <db.pub.mail@...il.com>
-Signed-off-by: Jakub Narebski <jnareb@...il.com>
----
- git-instaweb.sh    |    4 ++++
- gitweb/README      |    5 +++--
- gitweb/gitweb.perl |    2 +-
- 3 files changed, 8 insertions(+), 3 deletions(-)
-
---- a/git-instaweb.sh
-+++ b/git-instaweb.sh
-@@ -583,6 +583,10 @@
- our \$git_temp = "$fqgitdir/gitweb/tmp";
- our \$projects_list = \$projectroot;
- 
-+# we can trust our own repository, so disable XSS prevention
-+# to enable some extra features
-+our \$prevent_xss = 0;
-+
- \$feature{'remote_heads'}{'default'} = [1];
- EOF
- }
---- a/gitweb/gitweb.perl
-+++ b/gitweb/gitweb.perl
-@@ -170,7 +170,7 @@
- 
- # Disables features that would allow repository owners to inject script into
- # the gitweb domain.
--our $prevent_xss = 0;
-+our $prevent_xss = 1;
- 
- # Path to the highlight executable to use (must be the one from
- # http://www.andre-simon.de due to assumptions about parameters and output).

diff --git a/packaging/git-python-install-fix.diff b/packaging/git-python-install-fix.diff
deleted file mode 100644 (file)
index b37d571..0000000
--- a/packaging/git-python-install-fix.diff
+++ /dev/null
@@ -1,27 +0,0 @@
----
- Makefile                    |    2 +-
- git_remote_helpers/Makefile |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/git_remote_helpers/Makefile
-+++ b/git_remote_helpers/Makefile
-@@ -29,7 +29,7 @@
-       $(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build
- 
- install: $(pysetupfile)
--      $(PYTHON_PATH) $(pysetupfile) install --prefix $(DESTDIR_SQ)$(prefix)
-+      $(PYTHON_PATH) $(pysetupfile) install --prefix $(prefix) --root $(DESTDIR_SQ)
- 
- instlibdir: $(pysetupfile)
-       @echo "$(DESTDIR_SQ)$(prefix)/$(PYLIBDIR)"
---- a/Makefile
-+++ b/Makefile
-@@ -1800,7 +1800,7 @@
- $(patsubst %.py,%,$(SCRIPT_PYTHON)): % : %.py
-       $(QUIET_GEN)$(RM) $@ $@+ && \
-       INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C git_remote_helpers -s \
--              --no-print-directory prefix='$(prefix_SQ)' DESTDIR='$(DESTDIR_SQ)' \
-+              --no-print-directory prefix='$(prefix_SQ)' DESTDIR=\
-               instlibdir` && \
-       sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
-           -e 's|\(os\.getenv("GITPYTHONLIB"\)[^)]*)|\1,"@@INSTLIBDIR@@")|' \

diff --git a/packaging/git.spec b/packaging/git.spec
index 3308c12..3fb3168 100644 (file)
--- a/packaging/git.spec
+++ b/packaging/git.spec
@@ -2,22 +2,13 @@
 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
 
 Name:           git
-Version:        1.7.10.4
+Version:        1.8.0
 Release:        0
 License:        GPL-2.0
 Summary:        Fast, scalable, distributed revision control system
 Url:            http://git-scm.com
 Group:          Development/Tools/Version Control
 Source:         %{name}-%{version}.tar.bz2
-Source2:        sysconfig.git-daemon
-Source3:        git-daemon.init
-Source4:        git.xinetd
-Source5:        usr.share.git-web.gitweb.cgi
-Patch1:         git-nohardlink.diff
-Patch2:         git-python-install-fix.diff
-Patch3:         completion-wordbreaks.diff
-# CVE-2011-2186, bnc#698456
-Patch4:         git-prevent_xss-default.diff
 BuildRequires:  curl
 BuildRequires:  expat-devel
 BuildRequires:  fdupes
@@ -163,10 +154,6 @@ This package contains the building blocks for remote helpers written in Python.
 
 %prep
 %setup -q
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
 cat > .make <<'EOF'