[PATCH] Update cogito.spec.in

[PATCH] Update cogito.spec.in

[Chris Wright]

Latest updates to cogito.spec.in generated from review for Fedora Extras.

Signed-off-by: Chris Wright <chrisw@osdl.org>

---

 cogito.spec.in |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

e0ca49e6c375a68b3e4b3edfff752fef2cf585f6
diff --git a/cogito.spec.in b/cogito.spec.in
--- a/cogito.spec.in
+++ b/cogito.spec.in
@@ -1,15 +1,14 @@
 Name: 		cogito
 Version: 	@@VERSION@@
 Release: 	1
-Vendor: 	Petr Baudis <pasky@suse.cz>
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
 URL: 		http://kernel.org/pub/software/scm/cogito/
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-Prereq: 	sh-utils, diffutils, rsync, rcs, mktemp >= 1.5, git-core >= 0.99.3
-BuildArchitectures:	noarch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: 	git-core >= 0.99.3
+BuildArch:	noarch
 
 %description
 Cogito is a version control system layered on top of the git tree history
@@ -34,11 +33,18 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %{_bindir}/*
-%dir /usr/lib/cogito
-/usr/lib/cogito/*
+%dir %{_libdir}/cogito
+%{_libdir}/cogito/*
 %doc README COPYING Documentation/*
 
 %changelog
+* Thu Sep 15 2005 Chris Wright <chrisw@osdl.org> 0.14.1-1
+- Update to 0.14.1
+
+* Mon Aug 15 2005 Chris Wright <chrisw@osdl.org> 0.13-3
+- Update Buildroot, Requires and drop Vendor
+- use %{_libdir}
+
 * Wed Aug 10 2005 Pavel Roskin <proski@gnu.org> 0.13-1
 - Update summary and description
 - Make architecture-independent

Re: [PATCH] Update cogito.spec.in

[Petr Baudis]

Dear diary, on Fri, Sep 16, 2005 at 08:47:24AM CEST, I got a letter
where Chris Wright <chrisw@osdl.org> told me that...
> e0ca49e6c375a68b3e4b3edfff752fef2cf585f6
> diff --git a/cogito.spec.in b/cogito.spec.in
> --- a/cogito.spec.in
> +++ b/cogito.spec.in
> @@ -1,15 +1,14 @@
>  Name: 		cogito
>  Version: 	@@VERSION@@
>  Release: 	1
> -Vendor: 	Petr Baudis <pasky@suse.cz>
>  Summary:  	The Cogito Version Control System
>  License: 	GPL
>  Group: 		Development/Tools
>  URL: 		http://kernel.org/pub/software/scm/cogito/
>  Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
> -BuildRoot:	%{_tmppath}/%{name}-%{version}-root
> -Prereq: 	sh-utils, diffutils, rsync, rcs, mktemp >= 1.5, git-core >= 0.99.3
> -BuildArchitectures:	noarch
> +BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> +Requires: 	git-core >= 0.99.3
> +BuildArch:	noarch

Why did you remove all the stuff from Requires? They actually are ending
up adding even trivial stuff like less to it in GIT.

-- 
				Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
If you want the holes in your knowledge showing up try teaching
someone.  -- Alan Cox

Re: [PATCH] Update cogito.spec.in

[Chris Wright]

* Petr Baudis (pasky@suse.cz) wrote:
> Dear diary, on Fri, Sep 16, 2005 at 08:47:24AM CEST, I got a letter
> where Chris Wright <chrisw@osdl.org> told me that...
> > e0ca49e6c375a68b3e4b3edfff752fef2cf585f6
> > diff --git a/cogito.spec.in b/cogito.spec.in
> > --- a/cogito.spec.in
> > +++ b/cogito.spec.in
> > @@ -1,15 +1,14 @@
> >  Name: 		cogito
> >  Version: 	@@VERSION@@
> >  Release: 	1
> > -Vendor: 	Petr Baudis <pasky@suse.cz>
> >  Summary:  	The Cogito Version Control System
> >  License: 	GPL
> >  Group: 		Development/Tools
> >  URL: 		http://kernel.org/pub/software/scm/cogito/
> >  Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
> > -BuildRoot:	%{_tmppath}/%{name}-%{version}-root
> > -Prereq: 	sh-utils, diffutils, rsync, rcs, mktemp >= 1.5, git-core >= 0.99.3
> > -BuildArchitectures:	noarch
> > +BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> > +Requires: 	git-core >= 0.99.3
> > +BuildArch:	noarch
> 
> Why did you remove all the stuff from Requires? They actually are ending
> up adding even trivial stuff like less to it in GIT.

Primary reason is it now requires git, which has those prereqs.

thanks,
-chris

Re: [PATCH] Update cogito.spec.in

[Junio C Hamano]

Chris Wright <chrisw@osdl.org> writes:

> Primary reason is it now requires git, which has those prereqs.

Which I fully agree with.

Could you help me to modernize the git-core.spec.in?  I cannot
even tell if it needs any fix (I am not an RPM guy), but I
suspect dropping Vendor: may apply to git-core as well.

Re: [PATCH] Update cogito.spec.in

[Chris Wright]

* Junio C Hamano (junkio@cox.net) wrote:
> Chris Wright <chrisw@osdl.org> writes:
> 
> > Primary reason is it now requires git, which has those prereqs.
> 
> Which I fully agree with.
> 
> Could you help me to modernize the git-core.spec.in?  I cannot
> even tell if it needs any fix (I am not an RPM guy), but I
> suspect dropping Vendor: may apply to git-core as well.

Yes, I'm actually working on that ATM.  Update will follow shortly.

thanks,
-chris

Re: [PATCH] Update cogito.spec.in

[Horst von Brand]

Chris Wright <chrisw@osdl.org> wrote:
> * Petr Baudis (pasky@suse.cz) wrote:
> > Dear diary, on Fri, Sep 16, 2005 at 08:47:24AM CEST, I got a letter
> > where Chris Wright <chrisw@osdl.org> told me that...

[...]

> > > -BuildRoot:	%{_tmppath}/%{name}-%{version}-root
> > > -Prereq: 	sh-utils, diffutils, rsync, rcs, mktemp >= 1.5, git-core >= 0.99.3
> > > -BuildArchitectures:	noarch
> > > +BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> > > +Requires: 	git-core >= 0.99.3
> > > +BuildArch:	noarch

> > Why did you remove all the stuff from Requires? They actually are ending
> > up adding even trivial stuff like less to it in GIT.

> Primary reason is it now requires git, which has those prereqs.

It might be useful to say so in a comment.
-- 
Dr. Horst H. von Brand                   User #22616 counter.li.org
Departamento de Informatica                     Fono: +56 32 654431
Universidad Tecnica Federico Santa Maria              +56 32 654239
Casilla 110-V, Valparaiso, Chile                Fax:  +56 32 797513

[PATCH] Update cogito.spec.in

[Chris Wright]

* Horst von Brand (vonbrand@inf.utfsm.cl) wrote:
> It might be useful to say so in a comment.

Fair point.

thanks,
-chris
--

Update cogito.spec.in from feedback given during Fedora Extras review.

- update Buildroot to be more specific
- reduce Requires to git-core only (which must already satisfy the other reqs)
- drop Vendor
- use %{_libdir} macro

Signed-off-by: Chris Wright <chrisw@osdl.org>
---

 cogito.spec.in |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

e0ca49e6c375a68b3e4b3edfff752fef2cf585f6
diff --git a/cogito.spec.in b/cogito.spec.in
--- a/cogito.spec.in
+++ b/cogito.spec.in
@@ -1,15 +1,14 @@
 Name: 		cogito
 Version: 	@@VERSION@@
 Release: 	1
-Vendor: 	Petr Baudis <pasky@suse.cz>
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
 URL: 		http://kernel.org/pub/software/scm/cogito/
 Source: 	http://kernel.org/pub/software/scm/cogito/%{name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-Prereq: 	sh-utils, diffutils, rsync, rcs, mktemp >= 1.5, git-core >= 0.99.3
-BuildArchitectures:	noarch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: 	git-core >= 0.99.3
+BuildArch:	noarch
 
 %description
 Cogito is a version control system layered on top of the git tree history
@@ -34,11 +33,18 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %{_bindir}/*
-%dir /usr/lib/cogito
-/usr/lib/cogito/*
+%dir %{_libdir}/cogito
+%{_libdir}/cogito/*
 %doc README COPYING Documentation/*
 
 %changelog
+* Thu Sep 15 2005 Chris Wright <chrisw@osdl.org> 0.14.1-1
+- Update to 0.14.1
+
+* Mon Aug 15 2005 Chris Wright <chrisw@osdl.org> 0.13-3
+- Update Buildroot, Requires and drop Vendor
+- use %{_libdir}
+
 * Wed Aug 10 2005 Pavel Roskin <proski@gnu.org> 0.13-1
 - Update summary and description
 - Make architecture-independent

[PATCH] cogito: Fix rpm build for 64bit platforms

[Chris Wright]

When building last update on 64bit machine, I realized the _libdir
change breaks the rpm build there.  This fixes up the issue by ensuring
the libdir %install target is same as %files target.

Signed-off-by: Chris Wright <chrisw@osdl.org>
---
 cogito.spec.in |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/cogito.spec.in b/cogito.spec.in
--- a/cogito.spec.in
+++ b/cogito.spec.in
@@ -25,7 +25,7 @@ make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} install
+make DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} libdir=%{_libdir}/cogito install
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -38,6 +38,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc README COPYING Documentation/*
 
 %changelog
+* Fri Sep 16 2005 Chris Wright <chrisw@osdl.org> 0.14.1-2
+- fix _libdir breakage on 64-bit, the irony...
+
 * Thu Sep 15 2005 Chris Wright <chrisw@osdl.org> 0.14.1-1
 - Update to 0.14.1