# [PATCH] specfile cleanups 3 messages from 2005-11-11 to 2005-11-11. Participants: Chris Wright, Junio C Hamano, Andreas Ericsson. Thread: https://gitlist.dev/t/2452 ## Chris Wright, 2005-11-11 09:10 Subject: [PATCH] specfile cleanups Message-ID: <20051111091029.GW8041@shell0.pdx.osdl.net> URL: https://gitlist.dev/e/20051111091029.GW8041%40shell0.pdx.osdl.net ``` 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 --- diff --git a/git-core.spec.in b/git-core.spec.in index 26846d0..8ef29b8 100644 --- a/git-core.spec.in +++ b/git-core.spec.in @@ -1,4 +1,4 @@ -# Pass --without docs to rpmbuild if you don't want the documetnation +# Pass --without docs to rpmbuild if you don't want the documentation Name: git-core Version: @@VERSION@@ Release: 1%{?dist} @@ -7,7 +7,7 @@ License: GPL Group: Development/Tools URL: http://kernel.org/pub/software/scm/git/ Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz -BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} +BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk >= 8.4 @@ -20,22 +20,30 @@ rudimentary tools that can be used as a elsewhere for tools for ordinary humans layered on top of this. %package svn -Summary: Git tools for importing Subversion repositories. +Summary: Git tools for importing Subversion repositories Group: Development/Tools -Requires: subversion +Requires: git-core = %{version}-%{release} subversion %description svn Git tools for importing Subversion repositories. %package cvs -Summary: Git tools for importing CVS repositories. +Summary: Git tools for importing CVS repositories Group: Development/Tools -Requires: cvs +Requires: git-core = %{version}-%{release} cvs %description cvs Git tools for importing CVS repositories. +%package arch +Summary: Git tools for importing Arch repositories +Group: Development/Tools +Requires: git-core = %{version}-%{release} +%description arch +Git tools for importing Arch repositories. + %package email -Summary: Git tools for sending email. +Summary: Git tools for sending email Group: Development/Tools +Requires: git-core = %{version}-%{release} %description email Git tools for sending email. @@ -52,33 +60,54 @@ make %{_smp_mflags} DESTDIR=$RPM_BUILD_R prefix=%{_prefix} mandir=%{_mandir} \ install %{!?_without_docs: install-doc} -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "svn|cvs|email" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-files +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files %if %{!?_without_docs:1}0 -(find $RPM_BUILD_ROOT%{_mandir} -type f | grep -vE "svn|cvs|email" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-files +(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "arch|svn|git-cvs|email" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files %endif %clean rm -rf $RPM_BUILD_ROOT %files svn +%defattr(-,root,root) %{_bindir}/*svn* +%doc Documentation/*svn*.txt %{!?_without_docs: %{_mandir}/man1/*svn*.1*} +%{!?_without_docs: %doc Documentation/*svn*.html } %files cvs +%defattr(-,root,root) +%doc Documentation/*git-cvs*.txt %{_bindir}/*cvs* %{!?_without_docs: %{_mandir}/man1/*cvs*.1*} +%{!?_without_docs: %doc Documentation/*git-cvs*.html } + +%files arch +%defattr(-,root,root) +%doc Documentation/*arch*.txt +%{_bindir}/*arch* +%{!?_without_docs: %{_mandir}/man1/*arch*.1*} +%{!?_without_docs: %doc Documentation/*arch*.html } %files email +%defattr(-,root,root) +%doc Documentation/*email*.txt %{_bindir}/*email* %{!?_without_docs: %{_mandir}/man1/*email*.1*} +%{!?_without_docs: %doc Documentation/*email*.html } -%files -f bin-man-files +%files -f bin-man-doc-files %defattr(-,root,root) %{_datadir}/git-core/ %doc README COPYING Documentation/*.txt %{!?_without_docs: %doc Documentation/*.html } %changelog +* Thu Nov 10 2005 Chris Wright 0.99.9g-1 +- zlib dependency fix +- Minor cleanups from split +- Move arch import to separate package as well + * Tue Sep 27 2005 Jim Radford - Move programs with non-standard dependencies (svn, cvs, email) into separate packages ``` ## Junio C Hamano, 2005-11-11 09:22 Subject: Re: [PATCH] specfile cleanups Message-ID: <7vveyzpmi7.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vveyzpmi7.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <20051111091029.GW8041@shell0.pdx.osdl.net> ``` Chris Wright writes: > Some specfile cleanups after the split. Thanks. Does it matter some Requires use comma and others don't? > -BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} > +BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3} > BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) > Requires: zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk >= 8.4 > > Group: Development/Tools > -Requires: subversion > +Requires: git-core = %{version}-%{release} subversion ``` ## Andreas Ericsson, 2005-11-11 11:31 Subject: Re: [PATCH] specfile cleanups Message-ID: <43748104.5020707@op5.se> URL: https://gitlist.dev/e/43748104.5020707%40op5.se In-Reply-To: <7vveyzpmi7.fsf@assigned-by-dhcp.cox.net> ``` Junio C Hamano wrote: > Chris Wright writes: > > >>Some specfile cleanups after the split. > > > Thanks. > > Does it matter some Requires use comma and others don't? > Other than for consistency reasons, no. Most distributions have it in their conventions to use commas. Some don't. Most also have the conventions enforced by the attached script as it enhances readability by removing much un-necessary clutter. -- Andreas Ericsson andreas.ericsson@op5.se OP5 AB www.op5.se Tel: +46 8-230225 Fax: +46 8-230231 ```