@matheusbsbs / matheus-bagliano / commits / 0e60471c2a
Fork 0

[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 <chrisw@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Chris Wright committed Sep 16, 2005 at 13:38 UTC 0e60471c2a30882b9b44ebfd699d2414a0a348cc
1 file changed +20 -6
git-core.spec.in
+20 -6
@@ -1,16 +1,15 @@
1 # Pass --without docs to rpmbuild if you don't want the documetnation
2 Name: git-core
3 Version: @@VERSION@@
4 -Release: 1
5 -Vendor: Junio C Hamano <junkio@cox.net>
4 +Release: 1%{?dist}
5 Summary: Git core and tools
6 License: GPL
7 Group: Development/Tools
8 URL: http://kernel.org/pub/software/scm/git/
9 Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
10 BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
12 -BuildRoot: %{_tmppath}/%{name}-%{version}-root
13 -Requires: sh-utils, curl, diffutils, less, rsync, rcs, openssh-clients, perl, python >= 2.4, tk
11 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
12 +Requires: rsync, rcs, curl, less, openssh-clients, python >= 2.4, tk
13
14 %description
15 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.
23 %setup -q
24
25 %build
27 -make prefix=%{_prefix} all %{!?_without_docs: doc}
26 +make COPTS="$RPM_OPT_FLAGS" prefix=%{_prefix} all %{!?_without_docs: doc}
27
28 %install
29 rm -rf $RPM_BUILD_ROOT
@@ -37,13 +36,16 @@ rm -rf $RPM_BUILD_ROOT
36 %files
37 %defattr(-,root,root)
38 %{_bindir}/*
40 -%{_datadir}/git-core/templates/*
39 +%{_datadir}/git-core/
40 %doc README COPYING Documentation/*.txt
41 %{!?_without_docs: %doc Documentation/*.html }
42 %{!?_without_docs: %{_mandir}/man1/*.1*}
43 %{!?_without_docs: %{_mandir}/man7/*.7*}
44
45 %changelog
46 +* Fri Sep 16 2005 Chris Wright <chrisw@osdl.org> 0.99.6-1
47 +- update to 0.99.6
48 +
49 * Fri Sep 16 2005 Horst H. von Brand <vonbrand@inf.utfsm.cl>
50 - Linus noticed that less is required, added to the dependencies
51
@@ -51,6 +53,18 @@ rm -rf $RPM_BUILD_ROOT
53 - Updated dependencies
54 - Don't assume manpages are gzipped
55
56 +* Thu Aug 18 2005 Chris Wright <chrisw@osdl.org> 0.99.4-4
57 +- drop sh_utils, sh-utils, diffutils, mktemp, and openssl Requires
58 +- use RPM_OPT_FLAGS in spec file, drop patch0
59 +
60 +* Wed Aug 17 2005 Tom "spot" Callaway <tcallawa@redhat.com> 0.99.4-3
61 +- use dist tag to differentiate between branches
62 +- use rpm optflags by default (patch0)
63 +- own %{_datadir}/git-core/
64 +
65 +* Mon Aug 15 2005 Chris Wright <chrisw@osdl.org>
66 +- update spec file to fix Buildroot, Requires, and drop Vendor
67 +
68 * Sun Aug 07 2005 Horst H. von Brand <vonbrand@inf.utfsm.cl>
69 - Redid the description
70 - Cut overlong make line, loosened changelog a bit