Commit Graph

22 Commits

Author SHA1 Message Date
Junio C Hamano
592ee97d8f RPM: arch submodule needs tla.
Noticed by Horst von Brand.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-11 09:33:47 -08:00
Chris Wright
0867b0125a specfile cleanups
Some specfile cleanups after the split.
- zlib dependency fix, current method is inconsistent, you can
  potentially build a package that you can't install on machine you
  built it on
- Add proper defattr
- Remove trailing '.' in summary
- Add docs to split up packages
- Add git-core dependency for each subpackage
- Move arch import to separate package as well

Signed-off-by: Chris Wright <chrisw@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-11 01:24:31 -08:00
Jim Radford
14df4c4188 Add missing git-core and cvsps RPM dependencies.
Signed-off-by: Jim Radford <radford@blackbean.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-10 15:57:09 -08:00
Jim Radford
7d4de59b17 Separate RPMS for programs with non-standard dependencies.
Signed-off-by: Jim Radford <radford@blackbean.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-11-08 01:24:54 -08:00
Andreas Ericsson
7744f3b888 Require zlib >= 1.2 for RPM.
git-update-index requires zlib >= 1.2, which introduced the *Bound
functions.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-10-24 03:23:46 -07:00
H. Peter Anvin
e8f71fce37 COPTS -> CFLAGS 2005-09-27 09:02:24 -07:00
H. Peter Anvin
8fc7ba85c9 Parallelize the build 2005-09-27 09:01:08 -07:00
Junio C Hamano
3cc35e29ec Really require tk 8.4 (RPM)
**BLUSH**
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-27 00:15:45 -07:00
Junio C Hamano
1e1cba6433 Require tk 8.4 (RPM)
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-26 18:29:26 -07:00
Junio C Hamano
343d35c916 Ship our own copy of subprocess.py
so people without the latest Python could run merge-recursive.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-19 19:47:54 -07:00
Chris Wright
0e60471c2a [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>
2005-09-16 15:16:37 -07:00
Horst von Brand
c6ae61590f [PATCH] Require less in RPM spec
... and the next one will be the one to do Debian, naturally.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-15 23:31:44 -07:00
Horst von Brand
663a5ed5ca [PATCH] There are several undocumented dependencies
There are several undocumented dependencies in the .spec and in the
INSTALL files. The following is from Fedora, perhaps other RPM
distributions call the packages differently.

Also, the manpages aren't always installed gzipped.

Updates to git-core.spec.in file:
 - Some git scripts use Perl
 - gitk needs wish, which is part of TCL/Tk.
 - curl is used all over
 - Need the ssh program from openssh-clients

Updates to INSTALL:
 - Mention wish
 - Mention ssh

Signed-off-by: Horst H. von Brand <vonbrand@inf.utfsm.cl>
2005-09-12 19:15:02 -07:00
Junio C Hamano
720d150c48 Add a new merge strategy by Fredrik Kuivinen.
I really wanted to try this out, instead of asking for an adjustment
to the 'git merge' driver and waiting.  For now the new strategy is
called 'fredrik' and not in the list of default strategies to be tried.

The script wants Python 2.4 so this commit also adjusts Debian and RPM
build procecure files.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-09-10 19:46:53 -07:00
Junio C Hamano
5b6a8b6490 Adjust binary packaging to dest=>DESTDIR change.
Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-12 12:25:34 -07:00
Junio C Hamano
704a66f52e Make tools/ directory first-class citizen.
Tools directory being separate is just a historical
coincidence.  Build and install together with the main
directory, just like the clean target does. 

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-12 10:38:24 -07:00
Junio C Hamano
80f45687f4 Change RPM dependency from Prereq to Requires.
Sergey Vlasov says we do not pre-require (i.e. required packages
during installation) the dependencies, and should use Requires
instead of Prereq.  Knowing nothing about RPM, I just believe
him.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-08 15:03:39 -07:00
Horst von Brand
24db845c40 [PATCH] RPM spec updates.
Fix description and clean up the spec file.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-07 23:15:49 -07:00
Junio C Hamano
d5928d6026 Fix RPM build that omitted templates and tools.
Many many thanks go to Chris Wright and H. Peter Anvin whose
help were essential to get me going this build.

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-06 20:54:49 -07:00
Junio C Hamano
7a59013290 GIT 0.99.4 (release candidate)
This is my first attempt to adjust Debian and RPM to pass
prefix, to prepare the 0.99.4 release.

It updates debian/rules and git-core.spec.in to properly pass
prefix when building binary packages.  It also updates
debian/changelog to make the resulting binary package name
0.99.4; this is not needed on the RPM side (it takes the version
number from the main Makefile).

Signed-off-by: Junio C Hamano <junkio@cox.net>
2005-08-06 17:23:52 -07:00
Eric W. Biederman
49ce3d0c4e [PATCH] Update the spec file so it can build and install the documentation
If you don't want the documentation simply build with

	make RPMBUILD="rpmbuild --without docs"

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-15 11:38:24 -07:00
Linus Torvalds
f85639c303 Rename the RPM from "git" to "git-core"
That way we avoid any confusion with "GNU Interactive Tools", and it's
more descriptive anyway (the rpm documentation talks about how git is
split into a "core" part and an "SCM" part, this makes it clear that
this is the core one).
2005-07-12 10:07:18 -07:00