git-core-foo -> git-foo, except the core package
This patch renames the tarball "git" rather than "git-core", and changes the names of various packages from git-core-foo to git-foo. git-core is still the true core package; an empty RPM package named "git" pulls in ALL the git packages -- this makes updates work correctly, and allows "yum install git" to do the obvious thing. It also renames the git-(core-)tk package to gitk. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
H. Peter Anvin committed
Nov 14, 2005 at 22:12 UTC
8b649e27dd26608098605ded691b497ffa032500
2 files changed
+37
-13
Makefile
+7
-7
@@ -446,20 +446,20 @@ install-doc:
446
447
### Maintainer's dist rules
448
449
-git-core.spec: git-core.spec.in Makefile
449
+git.spec: git.spec.in Makefile
450
sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@
451
452
-GIT_TARNAME=git-core-$(GIT_VERSION)
453
-dist: git-core.spec git-tar-tree
452
+GIT_TARNAME=git-$(GIT_VERSION)
453
+dist: git.spec git-tar-tree
454
./git-tar-tree HEAD $(GIT_TARNAME) > $(GIT_TARNAME).tar
455
@mkdir -p $(GIT_TARNAME)
456
- @cp git-core.spec $(GIT_TARNAME)
457
- $(TAR) rf $(GIT_TARNAME).tar $(GIT_TARNAME)/git-core.spec
456
+ @cp git.spec $(GIT_TARNAME)
457
+ $(TAR) rf $(GIT_TARNAME).tar $(GIT_TARNAME)/git.spec
458
@rm -rf $(GIT_TARNAME)
459
gzip -f -9 $(GIT_TARNAME).tar
460
461
rpm: dist
462
- $(RPMBUILD) -ta git-core-$(GIT_VERSION).tar.gz
462
+ $(RPMBUILD) -ta $(GIT_TARNAME).tar.gz
463
464
deb: dist
465
rm -rf $(GIT_TARNAME)
@@ -472,7 +472,7 @@ deb: dist
472
clean:
473
rm -f *.o mozilla-sha1/*.o ppc/*.o compat/*.o $(PROGRAMS) $(LIB_FILE)
474
rm -f $(filter-out gitk,$(SCRIPTS))
475
- rm -f git-core.spec *.pyc *.pyo
475
+ rm -f *.spec *.pyc *.pyo
476
rm -rf $(GIT_TARNAME)
477
rm -f $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
478
rm -f git-core_$(GIT_VERSION)-*.dsc
git.spec.in
renamed
+30
-6
@@ -1,5 +1,5 @@
1
# Pass --without docs to rpmbuild if you don't want the documentation
2
-Name: git-core
2
+Name: git
3
Version: @@VERSION@@
4
Release: 1%{?dist}
5
Summary: Git core and tools
@@ -9,7 +9,7 @@ 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 >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
11
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
12
-Requires: zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, expat
12
+Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk
13
14
%description
15
This is a stupid (but extremely fast) directory content manager. It
@@ -19,6 +19,22 @@ distributed source code management system. This package includes
19
rudimentary tools that can be used as a SCM, but you should look
20
elsewhere for tools for ordinary humans layered on top of this.
21
22
+This is a dummy package which brings in all subpackages.
23
+
24
+%package core
25
+Summary: Core git tools
26
+Group: Development/Tools
27
+Requires: zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, expat
28
+%description core
29
+This is a stupid (but extremely fast) directory content manager. It
30
+doesn't do a whole lot, but what it _does_ do is track directory
31
+contents efficiently. It is intended to be the base of an efficient,
32
+distributed source code management system. This package includes
33
+rudimentary tools that can be used as a SCM, but you should look
34
+elsewhere for tools for ordinary humans layered on top of this.
35
+
36
+These are the core tools with minimal dependencies.
37
+
38
%package svn
39
Summary: Git tools for importing Subversion repositories
40
Group: Development/Tools
@@ -47,11 +63,11 @@ Requires: git-core = %{version}-%{release}
63
%description email
64
Git tools for sending email.
65
50
-%package tk
66
+%package -n gitk
67
Summary: Git revision tree visualiser ('gitk')
68
Group: Development/Tools
69
Requires: git-core = %{version}-%{release}, tk >= 8.4
54
-%description tk
70
+%description -n gitk
71
Git revision tree visualiser ('gitk')
72
73
%prep
@@ -75,6 +91,9 @@ make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease WIT
91
%clean
92
rm -rf $RPM_BUILD_ROOT
93
94
+%files
95
+# These are no files in the root package
96
+
97
%files svn
98
%defattr(-,root,root)
99
%{_bindir}/*svn*
@@ -103,20 +122,25 @@ rm -rf $RPM_BUILD_ROOT
122
%{!?_without_docs: %{_mandir}/man1/*email*.1*}
123
%{!?_without_docs: %doc Documentation/*email*.html }
124
106
-%files tk
125
+%files -n gitk
126
%defattr(-,root,root)
127
%doc Documentation/*gitk*.txt
128
%{_bindir}/*gitk*
129
%{!?_without_docs: %{_mandir}/man1/*gitk*.1*}
130
%{!?_without_docs: %doc Documentation/*gitk*.html }
131
113
-%files -f bin-man-doc-files
132
+%files core -f bin-man-doc-files
133
%defattr(-,root,root)
134
%{_datadir}/git-core/
135
%doc README COPYING Documentation/*.txt
136
%{!?_without_docs: %doc Documentation/*.html }
137
138
%changelog
139
+* Mon Nov 14 2005 H. Peter Anvin <hpa@zytor.com> 0.99.9j-1
140
+- Change subpackage names to git-<name> instead of git-core-<name>
141
+- Create empty root package which brings in all subpackages
142
+- Rename git-tk -> gitk
143
+
144
* Thu Nov 10 2005 Chris Wright <chrisw@osdl.org> 0.99.9g-1
145
- zlib dependency fix
146
- Minor cleanups from split