Hi Pasky,
Here's the outstanding updates for the spec file, up to 0.8-2 which is the latest on kernel.org.
http://www.kernel.org/pub/software/scm/cogito/RPMS/
thanks, -chris
threads / patch / 459
patch, 3 partscogito spec file updates
Subject: [PATCH 0/3] cogito spec file updates
[PATCH 1/3] cogito spec file 0.7-1
Update spec file to 0.7
Signed-off-by: Chris Wright <chrisw@osdl.org>
--- cogito/git.spec~0.6.3-1 2005-05-03 11:01:52.000000000 -0700 +++ cogito/git.spec 2005-05-03 11:10:32.000000000 -0700
Show changes to diff +4 −1
@@ -1,5 +1,5 @@ Name: git -Version: 0.6.3 +Version: 0.7 Release: 1 Vendor: Petr Baudis <pasky@ucw.cz> Summary: Git core and tools @@ -39,5 +39,8 @@ rm -rf $RPM_BUILD_ROOT #%{_mandir}/*/* %changelog +* Mon Apr 25 2005 Chris Wright <chrisw@osdl.org> 0.7-1 +- Update to 0.7 + * Thu Apr 21 2005 Chris Wright <chrisw@osdl.org> 0.6.3-1 - Initial rpm build
[PATCH 2/3] cogito spec file 0.8-1
Update spec file to cogito 0.8. Obsolete the git package, add some more build and install prereqs, move to /usr/bin, update URLs.
Signed-off-by: Chris Wright <chrisw@osdl.org>
--- cogito/git.spec~0.7-1 2005-05-03 11:02:15.000000000 -0700 +++ cogito/git.spec 2005-05-03 11:10:32.000000000 -0700
Show changes to diff +14 −11
@@ -1,16 +1,17 @@ -Name: git -Version: 0.7 +Name: cogito +Version: 0.8 Release: 1 Vendor: Petr Baudis <pasky@ucw.cz> Summary: Git core and tools License: GPL Group: Development/Tools -URL: http://pasky.or.cz/~pasky/dev/git/ -Source: http://pasky.or.cz/~pasky/dev/git/%{name}-pasky-%{version}.tar.bz2 -Provides: git = %{version} -BuildRequires: zlib-devel openssl-devel +URL: http://kernel.org/pub/software/scm/cogito/ +Source: http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.bz2 +Provides: cogito = %{version} +Obsoletes: git +BuildRequires: zlib-devel, openssl-devel, curl-devel BuildRoot: %{_tmppath}/%{name}-%{version}-root -Prereq: sh-utils diffutils +Prereq: sh-utils, diffutils, rsync, rcs, mktemp >= 1.5 %description GIT comes in two layers. The bottom layer is merely an extremely fast @@ -20,7 +21,7 @@ enables human beings to work with the da similar to other SCM tools (like CVS, BitKeeper or Monotone). %prep -%setup -q -n %{name}-pasky-%{version} +%setup -q -n %{name}-%{version} %build @@ -28,17 +29,19 @@ make %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT prefix=/usr/local install +make DESTDIR=$RPM_BUILD_ROOT prefix=/usr/ install %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -/usr/local/bin/* -#%{_mandir}/*/* +/usr/bin/* %changelog +* Mon Apr 25 2005 Chris Wright <chrisw@osdl.org> 0.8-1 +- Update to cogito, rename package, move to /usr/bin, update prereqs + * Mon Apr 25 2005 Chris Wright <chrisw@osdl.org> 0.7-1 - Update to 0.7
[PATCH 3/3] cogito spec file 0.8-2
Some small additions to the cogito spec file:
o include some documentation
o use %{_prefix} macro
o drop -n from %setup macro(chrisw: dropped spec file rename)
Signed-off-by: Terje Rosten <terje.rosten@ntnu.no> Signed-off-by: Chris Wright <chrisw@osdl.org>
--- cogito/git.spec~0.8-1 2005-05-03 11:02:28.000000000 -0700 +++ cogito/git.spec 2005-05-03 11:10:32.000000000 -0700
Show changes to diff +9 −3
@@ -1,6 +1,6 @@ Name: cogito Version: 0.8 -Release: 1 +Release: 2 Vendor: Petr Baudis <pasky@ucw.cz> Summary: Git core and tools License: GPL @@ -21,7 +21,7 @@ enables human beings to work with the da similar to other SCM tools (like CVS, BitKeeper or Monotone). %prep -%setup -q -n %{name}-%{version} +%setup -q %build @@ -29,7 +29,7 @@ make %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT prefix=/usr/ install +make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install %clean rm -rf $RPM_BUILD_ROOT @@ -37,8 +37,14 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) /usr/bin/* +%doc README README.reference COPYING Changelog %changelog +* Wed Apr 27 2005 Terje Rosten <terje.rosten@ntnu.no> 0.8-2 +- Doc files +- Use %%{_prefix} macro +- Drop -n option to %%setup macro + * Mon Apr 25 2005 Chris Wright <chrisw@osdl.org> 0.8-1 - Update to cogito, rename package, move to /usr/bin, update prereqs
Re: [PATCH 0/3] cogito spec file updates
* Chris Wright (chrisw@osdl.org) wrote:
> Here's the outstanding updates for the spec file, up to 0.8-2 which is > the latest on kernel.org. > > http://www.kernel.org/pub/software/scm/cogito/RPMS/
What's your method for creating a release tarball? If it were formalized (i.e. Makefile rule), then it'd be simple to use VERSION to drive the spec file, and it'd only need updating for real content changes (similar to what Kay did).
thanks, -chris
Petr BaudisRe: [PATCH 0/3] cogito spec file updates
Dear diary, on Tue, May 03, 2005 at 09:35:36PM CEST, I got a letter where Chris Wright <chrisw@osdl.org> told me that...
Show 10 quoted lines
> * Chris Wright (chrisw@osdl.org) wrote: > > Here's the outstanding updates for the spec file, up to 0.8-2 which is > > the latest on kernel.org. > > > > http://www.kernel.org/pub/software/scm/cogito/RPMS/ > > What's your method for creating a release tarball? If it were formalized > (i.e. Makefile rule), then it'd be simple to use VERSION to drive the > spec file, and it'd only need updating for real content changes (similar > to what Kay did).
For now, I do it so seldom that I just manually do
cg-log >Changelog cg-export ~/cogito-0.9 cp Changelog ~/cogito-0.9 cd ~ tar cvvfz cogito-0.9.tar.gz cogito-0.9
OTOH, I'd like to change this all to just
cg-export ~/cogito-0.9.tar.gz
when I get to merge the relevant patches; I'm not sure there is so much of a value to bundle the Changelog; just get the git tree and do cg-log on your own, or use the web interface.
I might however have some private mkrelease.sh script which would do
echo "$1" >VERSION update-spec-file echo "$1" | cg-commit cg-tag "$1"
or something.
BTW, did you have a particular reason to split the .spec file updates to three parts? I think it doesn't make much sense and it'd be probably enough to update it at once, when we are not doing it at the right time anyway.
-- Petr "Pasky" Baudis Stuff: http://pasky.or.cz/ C++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor
Re: [PATCH 0/3] cogito spec file updates
* Petr Baudis (pasky@ucw.cz) wrote:
Show 37 quoted lines
> Dear diary, on Tue, May 03, 2005 at 09:35:36PM CEST, I got a letter > where Chris Wright <chrisw@osdl.org> told me that... > > * Chris Wright (chrisw@osdl.org) wrote: > > > Here's the outstanding updates for the spec file, up to 0.8-2 which is > > > the latest on kernel.org. > > > > > > http://www.kernel.org/pub/software/scm/cogito/RPMS/ > > > > What's your method for creating a release tarball? If it were formalized > > (i.e. Makefile rule), then it'd be simple to use VERSION to drive the > > spec file, and it'd only need updating for real content changes (similar > > to what Kay did). > > For now, I do it so seldom that I just manually do > > cg-log >Changelog > cg-export ~/cogito-0.9 > cp Changelog ~/cogito-0.9 > cd ~ > tar cvvfz cogito-0.9.tar.gz cogito-0.9 > > OTOH, I'd like to change this all to just > > cg-export ~/cogito-0.9.tar.gz > > when I get to merge the relevant patches; I'm not sure there is so much > of a value to bundle the Changelog; just get the git tree and do cg-log > on your own, or use the web interface. > > I might however have some private mkrelease.sh script which would do > > echo "$1" >VERSION > update-spec-file > echo "$1" | cg-commit > cg-tag "$1" > > or something.
If you had a Makefile target like the one Mark Allen just posted, would you use that? I'd simply add a git.spec: rule, and have git.spec built as a dependency for tarball.
> BTW, did you have a particular reason to split the .spec file updates to > three parts? I think it doesn't make much sense and it'd be probably > enough to update it at once, when we are not doing it at the right time > anyway.
Just because that's how I had them locally, and it keeps the file revision history intact (I don't mind how you prefer to pull them in).
thanks, -chris