Changeset 1556

Timestamp:

Jan 15, 2019, 8:49:10 AM (7 years ago)

Author:

Silvan Scherrer

Message:

spec: git: Release version 2.11.0-4.

File:

• spec/trunk/SPECS/git.spec (modified) (18 diffs)

spec/trunk/SPECS/git.spec

@@ -15 +15 @@
 %global use_systemd         0
 
+# only used for thew os/2 build, as we lack some components
+%global remove_nonworking   1
+
 Name:           git
 Version:        2.11.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
@@ -36 +39 @@
 #BuildRequires:  emacs
 BuildRequires:  expat-devel
+BuildRequires:  findutils
 BuildRequires:  gettext-devel
 BuildRequires:  %{libcurl_devel}
@@ -50 +54 @@
 Requires:       git-core = %{version}-%{release}
 Requires:       git-core-doc = %{version}-%{release}
-#Requires:       perl(Error)
+Requires:       perl(Error)
 %if ! %{defined perl_bootstrap}
 # TODO Doesn't exist on OS/2 yet.
@@ -76 +80 @@
 %endif
 Requires:       git = %{version}-%{release}
+%if ! %{remove_nonworking}
 Requires:       git-cvs = %{version}-%{release}
 Requires:       git-email = %{version}-%{release}
 Requires:       git-gui = %{version}-%{release}
 Requires:       git-svn = %{version}-%{release}
+%endif
 Requires:       git-p4 = %{version}-%{release}
+%if ! %{remove_nonworking}
 Requires:       gitk = %{version}-%{release}
+%endif
 Requires:       perl-Git = %{version}-%{release}
 %if ! %{defined perl_bootstrap}
@@ -137 +145 @@
 The git dÊmon for supporting git:// access to git repositories
 
-%if 0
+%if ! %{remove_nonworking}
 %package -n gitweb
 Summary:        Simple web interface to git repositories
@@ -161 +169 @@
 %{summary}.
 
+%if ! %{remove_nonworking}
 %package svn
 Summary:        Git tools for importing Subversion repositories
@@ -196 +205 @@
 %description email
 Git tools for sending email.
-
-%if 0
+%endif
+
+%if ! %{remove_nonworking}
 
 %package gui
@@ -249 +259 @@
 Perl interface to Git.
 
-%if 0
+%if ! %{remove_nonworking}
 
 %package -n emacs-git
@@ -325 +335 @@
 %endif
 
-%if 0
+%if ! %{remove_nonworking}
 make -C contrib/emacs
 %endif
@@ -346 +356 @@
 %endif
 
-%if 0
+%if ! %{remove_nonworking}
 
 %global elispdir %{_emacs_sitelispdir}/git
@@ -368 +378 @@
 rm -f %{buildroot}%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/git-subtree.html
 
-%if 0
+%if ! %{remove_nonworking}
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
 install -pm 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf
@@ -377 +387 @@
 %endif
 
+#remove svn, cvs and some more non working stuff
+%if %{remove_nonworking}
+rm -rf %{buildroot}%{_bindir}/git-cvsserver
+rm -rf %{buildroot}%{gitcoredir}/git-cvsexportcommit
+rm -rf %{buildroot}%{gitcoredir}/git-cvsimport
+rm -rf %{buildroot}%{gitcoredir}/git-cvsserver
+rm -rf %{buildroot}%{gitcoredir}/git-remote-testsvn.exe
+rm -rf %{buildroot}%{gitcoredir}/git-send-email
+rm -rf %{buildroot}%{gitcoredir}/git-svn
+%endif
+
 find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
 find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';'
@@ -385 +406 @@
 
 exclude_re="archimport|email|git-citool|git-cvs|git-daemon|git-gui|git-remote-bzr|git-remote-hg|gitk|p4|svn"
-(find %{buildroot}%{_bindir} %{buildroot}%{_libexecdir} -type f | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files
+(find %{buildroot}%{_bindir} %{buildroot}%{_libexecdir} -type f -o -type l | grep -vE "$exclude_re" | sed -e s@^%{buildroot}@@) > bin-man-doc-files
 (find %{buildroot}%{_bindir} %{buildroot}%{_libexecdir} -mindepth 1 -type d | grep -vE "$exclude_re" | sed -e 's@^%{buildroot}@%dir @') >> bin-man-doc-files
 (find %{buildroot}%{perl_vendorlib} -type f | sed -e s@^%{buildroot}@@) > perl-git-files
@@ -527 +548 @@
 %{!?_without_docs: %doc Documentation/*p4*.html }
 
+%if ! %{remove_nonworking}
 %files svn
 %defattr(-,root,root)
@@ -550 +572 @@
 %{!?_without_docs: %{_mandir}/man1/*email*.1*}
 %{!?_without_docs: %doc Documentation/*email*.html }
-
-%if 0
 
 %files gui
@@ -583 +603 @@
 %{!?_without_docs: %{_mandir}/man3/*Git*SVN*.3pm*}
 
-%if 0
+%if ! %{remove_nonworking}
 
 %files -n emacs-git
@@ -610 +630 @@
 %endif
 %{gitcoredir}/git-daemon*
+%exclude %{gitcoredir}/*.dbg
 %{_var}/lib/git
 %{!?_without_docs: %{_mandir}/man1/*daemon*.1*}
 %{!?_without_docs: %doc Documentation/*daemon*.html}
 
-%if 0
+%if ! %{remove_nonworking}
 %files -n gitweb
 %defattr(-,root,root)
@@ -627 +648 @@
 
 %changelog
+* Mon Jan 14 2019 Silvan Scherrer <silvan.scherrer@aroa.ch> 2.11.0-4
+- build with latest tools to overcome a dbg file creation issue (ticket #193)
+- fix git-all rpm (rpm ticket #327)
+
 * Mon Jun 4 2018 Dmitriy Kuminov <coding@dmik.org> 2.11.0-3
 - Make updated file locking fully work on OS/2 (no more chmod errors).