Accepting request 116217 from devel:tools:scm

Fix build on SLE_11

Note that there are a lot of changes in the diff that seem to be from the format spec source service. Didn't know whether I should revert them... (forwarded request 116130 from flichtenheld)

OBS-URL: https://build.opensuse.org/request/show/116217
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=84

git.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue May  1 16:40:22 UTC 2012 - frank.lichtenheld@sophos.com
+
+- Fix build on SLE_11, seems %files there doesn't support more
+  than one -f option
+
 -------------------------------------------------------------------
 Mon Feb 27 11:43:15 UTC 2012 - saschpe@suse.de
 

git.spec

@@ -15,20 +15,21 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %define gitexecdir %_libexecdir/git
 %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
 
 Name:           git
 BuildRequires:  asciidoc
 BuildRequires:  curl
+BuildRequires:  fdupes
 BuildRequires:  libcurl-devel
 BuildRequires:  libexpat-devel
-BuildRequires:  fdupes
 BuildRequires:  libopenssl-devel
+BuildRequires:  perl-Error
+BuildRequires:  python
 BuildRequires:  sgml-skel
 BuildRequires:  xmlto
-BuildRequires:  python
-BuildRequires:  perl-Error
 Version:        1.7.9.2
 Release:        0
 Summary:        Fast, scalable, distributed revision control system
@@ -66,8 +67,11 @@ CVS, and GNU arch.
 %package core
 Summary:        Core git tools
 Group:          Development/Tools/Version Control
-Requires:       rsync, less, openssh, perl-Error
+Requires:       less
+Requires:       openssh
+Requires:       perl-Error
 Requires:       perl-base = %{perl_version}
+Requires:       rsync
 
 %description core
 Git is a fast, scalable, distributed revision control system with an
@@ -79,7 +83,8 @@ These are the core tools with minimal dependencies.
 %package svn
 Summary:        Git tools for importing Subversion repositories
 Group:          Development/Tools/Version Control
-Requires:       git-core = %{version}, subversion
+Requires:       git-core = %{version}
+Requires:       subversion
 Requires:       subversion-perl
 
 %description svn
@@ -89,7 +94,10 @@ system.
 %package cvs
 Summary:        Git tools for importing CVS repositories
 Group:          Development/Tools/Version Control
-Requires:       git-core = %{version}, cvs, cvsps, perl-DBD-SQLite
+Requires:       cvs
+Requires:       cvsps
+Requires:       git-core = %{version}
+Requires:       perl-DBD-SQLite
 
 %description cvs
 Tools for importing CVS repositories to the Git version control system.
@@ -127,7 +135,8 @@ read only access to repositories in /srv/git/ that contain the
 %package -n gitk
 Summary:        Git revision tree visualiser
 Group:          Development/Tools/Version Control
-Requires:       git-core = %{version}, tk >= 8.4
+Requires:       git-core = %{version}
+Requires:       tk >= 8.4
 Supplements:    packageand(git-core:tk)
 
 %description -n gitk
@@ -141,7 +150,8 @@ found in the package git-gui.
 %package gui
 Summary:        Grapical tool for common git operations
 Group:          Development/Tools/Version Control
-Requires:       git-core = %{version}, tk >= 8.4
+Requires:       git-core = %{version}
+Requires:       tk >= 8.4
 Supplements:    packageand(git-core:tk)
 
 %description gui
@@ -169,7 +179,8 @@ directory /git/ that calls the cgi script.
 %package remote-helpers
 Summary:        Python package for remote helper scripts
 Group:          Development/Tools/Version Control
-Requires:       git-core = %{version}, python
+Requires:       git-core = %{version}
+Requires:       python
 
 %description remote-helpers
 This package contains the building blocks for remote helpers written in Python.
@@ -249,6 +260,7 @@ if ! test -f $RPM_BUILD_ROOT%{gitexecdir}/git-add; then
   exit 1
 fi
 %find_lang %{name}
+cat %{name}.lang >>bin-man-doc-files
 # use symlinks instead of hardlinks in sub-commands
 %fdupes -s $RPM_BUILD_ROOT
 
@@ -348,7 +360,7 @@ fi
 %py_sitedir/*
 %endif
 
-%files core -f bin-man-doc-files -f %{name}.lang
+%files core -f bin-man-doc-files
 %defattr(-,root,root)
 %{_bindir}/git
 %{_datadir}/git-core/