diff --git a/git.changes b/git.changes index 6f2b868..eff97ee 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Nov 4 08:45:59 CET 2008 - olh@suse.de + +- use fdupes only if the distribution provides it +- use libopenssl-devel only if the distribution provides it + ------------------------------------------------------------------- Fri Oct 24 15:03:52 CEST 2008 - tiwai@suse.de diff --git a/git.spec b/git.spec index fc8dce2..aff9ded 100644 --- a/git.spec +++ b/git.spec @@ -18,9 +18,25 @@ Name: git -BuildRequires: asciidoc curl-devel fdupes libopenssl-devel sgml-skel xmlto +%if 0%{?suse_version} < 1030 +%define dist_has_fdupes 0 +%else +%define dist_has_fdupes 1 +%endif +BuildRequires: asciidoc +BuildRequires: curl-devel +%if %{dist_has_fdupes} +BuildRequires: fdupes +%endif +%if 0%{?suse_version} < 1030 +BuildRequires: openssl-devel +%else +BuildRequires: libopenssl-devel +%endif +BuildRequires: sgml-skel +BuildRequires: xmlto Version: 1.6.0.2 -Release: 4 +Release: 5 Summary: Fast, scalable, distributed revision control system License: GPL v2 or later Group: Development/Tools/Version Control @@ -273,8 +289,10 @@ rm -rf ${RPM_BUILD_ROOT}/usr/lib/perl5/site_perl %perl_process_packlist find $RPM_BUILD_ROOT/%_mandir -type f -print0 | xargs -0 chmod 644 install -m 644 -D contrib/completion/git-completion.bash $RPM_BUILD_ROOT/etc/bash_completion.d/git.sh +%if %{dist_has_fdupes} # use symlinks instead of hardlinks in sub-commands %fdupes -s $RPM_BUILD_ROOT +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -376,6 +394,9 @@ fi /etc/bash_completion.d/git.sh %changelog +* Tue Nov 04 2008 olh@suse.de +- use fdupes only if the distribution provides it +- use libopenssl-devel only if the distribution provides it * Fri Oct 24 2008 tiwai@suse.de - fix git.xinetd not to run the old git-daemon (bnc#438715) * Mon Oct 06 2008 tiwai@suse.de @@ -526,7 +547,7 @@ fi git-apply wouldn't apply creation/deletion patches * Tue Nov 07 2006 ro@suse.de - fix permissions for manpages -* Sun Oct 29 2006 meissner@suse.de +* Sat Oct 28 2006 meissner@suse.de - use RPM_OPT_FLAGS also in %%install make * Thu Oct 26 2006 pbaudis@suse.cz - Upgrade to git-1.4.3.3 - bugfixes release @@ -581,7 +602,7 @@ fi rename git to git-core, to match the upstream package name * Sun Jul 03 2005 kasievers@suse.de - New version 0.7git20050703 -* Fri Jul 01 2005 kasievers@suse.de +* Thu Jun 30 2005 kasievers@suse.de - New version 20050630 * Fri Jun 24 2005 kasievers@suse.de - New version 20050624