From 0e60471c2a30882b9b44ebfd699d2414a0a348cc Mon Sep 17 00:00:00 2001 From: Chris Wright Date: Fri, 16 Sep 2005 13:38:49 -0700 Subject: [PATCH] [PATCH] Update git-core.spec.in Update git-core spec file based on feedback from Fedora Extras review. - update BuildRoot to be more specific - eliminate Requires that must be satisfied for base system install - drop Vendor - use dist tag to differentiate between branches - own %{_datadir}/git-core/ - use RPM_OPT_FLAGS in spec file Signed-off-by: Chris Wright Signed-off-by: Junio C Hamano --- git-core.spec.in | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/git-core.spec.in b/git-core.spec.in index 677e44f1d..6c17d523f 100644 --- a/git-core.spec.in +++ b/git-core.spec.in @@ -1,16 +1,15 @@ # Pass --without docs to rpmbuild if you don't want the documetnation Name: git-core Version: @@VERSION@@ -Release: 1 -Vendor: Junio C Hamano +Release: 1%{?dist} Summary: Git core and tools License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Requires: sh-utils, curl, diffutils, less, rsync, rcs, openssh-clients, perl, python >= 2.4, tk +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.4, tk %description This is a stupid (but extremely fast) directory content manager. It @@ -24,7 +23,7 @@ elsewhere for tools for ordinary humans layered on top of this. %setup -q %build -make prefix=%{_prefix} all %{!?_without_docs: doc} +make COPTS="$RPM_OPT_FLAGS" prefix=%{_prefix} all %{!?_without_docs: doc} %install rm -rf $RPM_BUILD_ROOT @@ -37,13 +36,16 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %{_bindir}/* -%{_datadir}/git-core/templates/* +%{_datadir}/git-core/ %doc README COPYING Documentation/*.txt %{!?_without_docs: %doc Documentation/*.html } %{!?_without_docs: %{_mandir}/man1/*.1*} %{!?_without_docs: %{_mandir}/man7/*.7*} %changelog +* Fri Sep 16 2005 Chris Wright 0.99.6-1 +- update to 0.99.6 + * Fri Sep 16 2005 Horst H. von Brand - Linus noticed that less is required, added to the dependencies @@ -51,6 +53,18 @@ rm -rf $RPM_BUILD_ROOT - Updated dependencies - Don't assume manpages are gzipped +* Thu Aug 18 2005 Chris Wright 0.99.4-4 +- drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires +- use RPM_OPT_FLAGS in spec file, drop patch0 + +* Wed Aug 17 2005 Tom "spot" Callaway 0.99.4-3 +- use dist tag to differentiate between branches +- use rpm optflags by default (patch0) +- own %{_datadir}/git-core/ + +* Mon Aug 15 2005 Chris Wright +- update spec file to fix Buildroot, Requires, and drop Vendor + * Sun Aug 07 2005 Horst H. von Brand - Redid the description - Cut overlong make line, loosened changelog a bit -- 2.30.2