pool/git
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 138328 from devel:tools:scm

Browse Source 
- Use ./.make also in %check to test exactly what was built
- Avoid duplicate file warnings (forwarded request 138128 from AndreasSchwab)

OBS-URL: https://build.opensuse.org/request/show/138328
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=94
This commit is contained in:
Stephan Kulow 2012-10-16 19:32:02 +00:00 committed by Git OBS Bridge
parent 27ffe2c069
commit c3a83f62ec
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
git.changes
View File

@ -32,6 +32,12 @@ Thu Oct 11 00:19:07 CST 2012 - douglarek@outlook.com
Also contains a handful of documentation updates. Also contains a handful of documentation updates.
-------------------------------------------------------------------
Mon Oct 8 20:50:47 UTC 2012 - schwab@linux-m68k.org
- Use ./.make also in %check to test exactly what was built
- Avoid duplicate file warnings
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 4 22:29:10 CST 2012 - douglarek@outlook.com Thu Oct 4 22:29:10 CST 2012 - douglarek@outlook.com

7
git.spec
View File

@ -236,7 +236,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir}
install -m 644 %{S:6} $RPM_BUILD_ROOT/%{_fwdefdir}/git-daemon install -m 644 %{S:6} $RPM_BUILD_ROOT/%{_fwdefdir}/git-daemon
### ###
(find $RPM_BUILD_ROOT%{_bindir} -type f -o -type l | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files (find $RPM_BUILD_ROOT%{_bindir} -type f -o -type l | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
(find $RPM_BUILD_ROOT%{gitexecdir} -mindepth 1 | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) >> bin-man-doc-files (find $RPM_BUILD_ROOT%{gitexecdir} ! -type d | grep -vE "archimport|svn|cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@) >> bin-man-doc-files
(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files (find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|daemon|gui" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
( pushd perl ( pushd perl
perl Makefile.PL perl Makefile.PL
@ -268,7 +268,7 @@ cat %{name}.lang >>bin-man-doc-files
%fdupes -s $RPM_BUILD_ROOT %fdupes -s $RPM_BUILD_ROOT
%check %check
make %{?_smp_mflags} test ./.make %{?_smp_mflags} test
%pre daemon %pre daemon
if ! /usr/bin/getent passwd git-daemon >/dev/null; then if ! /usr/bin/getent passwd git-daemon >/dev/null; then
@ -365,9 +365,9 @@ fi
%files core -f bin-man-doc-files %files core -f bin-man-doc-files
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/git
%{_datadir}/git-core/ %{_datadir}/git-core/
%dir %{gitexecdir} %dir %{gitexecdir}
%dir %{gitexecdir}/mergetools
%doc README COPYING Documentation/*.txt %doc README COPYING Documentation/*.txt
%{!?_without_docs: %doc Documentation/*.html } %{!?_without_docs: %doc Documentation/*.html }
%if 0%{?suse_version} < 1140 %if 0%{?suse_version} < 1140
@ -375,7 +375,6 @@ fi
%endif %endif
%{perl_vendorlib}/Git.pm %{perl_vendorlib}/Git.pm
%{perl_vendorlib}/Git/ %{perl_vendorlib}/Git/
%{perl_vendorlib}/Git/*.pm
%{perl_vendorarch}/auto/Git/ %{perl_vendorarch}/auto/Git/
/etc/bash_completion.d/*.sh /etc/bash_completion.d/*.sh