{"thread":{"id":"2452","subject":"[PATCH] specfile cleanups","startedAt":"2005-11-11T09:10:29Z","lastAt":"2005-11-11T11:31:16Z","messageCount":3,"participants":["Chris Wright","Junio C Hamano","Andreas Ericsson"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"11566","messageId":"20051111091029.GW8041@shell0.pdx.osdl.net","threadId":"2452","inReplyTo":null,"subject":"[PATCH] specfile cleanups","fromName":"Chris Wright","fromEmail":"chrisw@osdl.org","sentAt":"2005-11-11T09:10:29Z","receivedAt":"2005-11-11T09:10:29Z","isPatch":true,"sender":{"key":"chrisw@sous-sol.org","avatar":null},"body":"Some specfile cleanups after the split.\n- zlib dependency fix, current method is inconsistent, you can\n  potentially build a package that you can't install on machine you\n  built it on\n- Add proper defattr\n- Remove trailing '.' in summary\n- Add docs to split up packages\n- Add git-core dependency for each subpackage\n- Move arch import to separate package as well\n\nSigned-off-by: Chris Wright <chrisw@osdl.org>\n---\n\ndiff --git a/git-core.spec.in b/git-core.spec.in\nindex 26846d0..8ef29b8 100644\n--- a/git-core.spec.in\n+++ b/git-core.spec.in\n@@ -1,4 +1,4 @@\n-# Pass --without docs to rpmbuild if you don't want the documetnation\n+# Pass --without docs to rpmbuild if you don't want the documentation\n Name: \t\tgit-core\n Version: \t@@VERSION@@\n Release: \t1%{?dist}\n@@ -7,7 +7,7 @@ License: \tGPL\n Group: \t\tDevelopment/Tools\n URL: \t\thttp://kernel.org/pub/software/scm/git/\n Source: \thttp://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz\n-BuildRequires:\tzlib-devel, openssl-devel, curl-devel  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}\n+BuildRequires:\tzlib-devel >= 1.2, openssl-devel, curl-devel  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}\n BuildRoot:\t%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)\n Requires:\tzlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk >= 8.4\n \n@@ -20,22 +20,30 @@ rudimentary tools that can be used as a \n elsewhere for tools for ordinary humans layered on top of this.\n \n %package svn\n-Summary:        Git tools for importing Subversion repositories.\n+Summary:        Git tools for importing Subversion repositories\n Group:          Development/Tools\n-Requires:       subversion\n+Requires:       git-core = %{version}-%{release} subversion\n %description svn\n Git tools for importing Subversion repositories.\n \n %package cvs\n-Summary:        Git tools for importing CVS repositories.\n+Summary:        Git tools for importing CVS repositories\n Group:          Development/Tools\n-Requires:       cvs\n+Requires:       git-core = %{version}-%{release} cvs\n %description cvs\n Git tools for importing CVS repositories.\n \n+%package arch\n+Summary:        Git tools for importing Arch repositories\n+Group:          Development/Tools\n+Requires:       git-core = %{version}-%{release}\n+%description arch\n+Git tools for importing Arch repositories.\n+\n %package email\n-Summary:        Git tools for sending email.\n+Summary:        Git tools for sending email\n Group:          Development/Tools\n+Requires:\tgit-core = %{version}-%{release} \n %description email\n Git tools for sending email.\n \n@@ -52,33 +60,54 @@ make %{_smp_mflags} DESTDIR=$RPM_BUILD_R\n      prefix=%{_prefix} mandir=%{_mandir} \\\n      install %{!?_without_docs: install-doc}\n \n-(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE \"svn|cvs|email\" | sed -e s@^$RPM_BUILD_ROOT@@)               > bin-man-files\n+(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE \"arch|svn|cvs|email\" | sed -e s@^$RPM_BUILD_ROOT@@)               > bin-man-doc-files\n %if %{!?_without_docs:1}0\n-(find $RPM_BUILD_ROOT%{_mandir} -type f | grep -vE \"svn|cvs|email\" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-files\n+(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\n %endif\n \n %clean\n rm -rf $RPM_BUILD_ROOT\n \n %files svn\n+%defattr(-,root,root)\n %{_bindir}/*svn*\n+%doc Documentation/*svn*.txt\n %{!?_without_docs: %{_mandir}/man1/*svn*.1*}\n+%{!?_without_docs: %doc Documentation/*svn*.html }\n \n %files cvs\n+%defattr(-,root,root)\n+%doc Documentation/*git-cvs*.txt\n %{_bindir}/*cvs*\n %{!?_without_docs: %{_mandir}/man1/*cvs*.1*}\n+%{!?_without_docs: %doc Documentation/*git-cvs*.html }\n+\n+%files arch\n+%defattr(-,root,root)\n+%doc Documentation/*arch*.txt\n+%{_bindir}/*arch*\n+%{!?_without_docs: %{_mandir}/man1/*arch*.1*}\n+%{!?_without_docs: %doc Documentation/*arch*.html }\n \n %files email\n+%defattr(-,root,root)\n+%doc Documentation/*email*.txt\n %{_bindir}/*email*\n %{!?_without_docs: %{_mandir}/man1/*email*.1*}\n+%{!?_without_docs: %doc Documentation/*email*.html }\n \n-%files -f bin-man-files\n+%files -f bin-man-doc-files\n %defattr(-,root,root)\n %{_datadir}/git-core/\n %doc README COPYING Documentation/*.txt\n %{!?_without_docs: %doc Documentation/*.html }\n \n %changelog\n+* Thu Nov 10 2005 Chris Wright <chrisw@osdl.org> 0.99.9g-1\n+- zlib dependency fix\n+- Minor cleanups from split\n+- Move arch import to separate package as well\n+\n * Tue Sep 27 2005 Jim Radford <radford@blackbean.org>\n - Move programs with non-standard dependencies (svn, cvs, email)\n   into separate packages\n"},{"id":"11568","messageId":"7vveyzpmi7.fsf@assigned-by-dhcp.cox.net","threadId":"2452","inReplyTo":"20051111091029.GW8041@shell0.pdx.osdl.net","subject":"Re: [PATCH] specfile cleanups","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2005-11-11T09:22:24Z","receivedAt":"2005-11-11T09:22:24Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Chris Wright <chrisw@osdl.org> writes:\n\n> Some specfile cleanups after the split.\n\nThanks.\n\nDoes it matter some Requires use comma and others don't?\n\n> -BuildRequires:\tzlib-devel, openssl-devel, curl-devel  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}\n> +BuildRequires:\tzlib-devel >= 1.2, openssl-devel, curl-devel  %{!?_without_docs:, xmlto, asciidoc > 6.0.3}\n>  BuildRoot:\t%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)\n>  Requires:\tzlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk >= 8.4\n>  \n>  Group:          Development/Tools\n> -Requires:       subversion\n> +Requires:       git-core = %{version}-%{release} subversion\n"},{"id":"11578","messageId":"43748104.5020707@op5.se","threadId":"2452","inReplyTo":"7vveyzpmi7.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH] specfile cleanups","fromName":"Andreas Ericsson","fromEmail":"ae@op5.se","sentAt":"2005-11-11T11:31:16Z","receivedAt":"2005-11-11T11:31:16Z","isPatch":true,"sender":{"key":"ae@op5.se","avatar":"https://gravatar.com/avatar/426e89595c75a8f5252dd0c989e5fabe5bcac616e68557427ad9aef6b0ca342a?d=mp&s=160"},"body":"Junio C Hamano wrote:\n> Chris Wright <chrisw@osdl.org> writes:\n> \n> \n>>Some specfile cleanups after the split.\n> \n> \n> Thanks.\n> \n> Does it matter some Requires use comma and others don't?\n> \n\nOther than for consistency reasons, no. Most distributions have it in \ntheir conventions to use commas. Some don't.\n\nMost also have the conventions enforced by the attached script as it \nenhances readability by removing much un-necessary clutter.\n\n-- \nAndreas Ericsson                   andreas.ericsson@op5.se\nOP5 AB                             www.op5.se\nTel: +46 8-230225                  Fax: +46 8-230231\n"}]}