{"thread":{"id":"4719","subject":"[PATCH 2/3] Delete manuals if compiling without docs","startedAt":"2006-06-30T05:09:23Z","lastAt":"2006-06-30T18:08:11Z","messageCount":6,"participants":["Pavel Roskin","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"22888","messageId":"20060630050923.701.37665.stgit@dv.roinet.com","threadId":"4719","inReplyTo":null,"subject":"[PATCH 1/3] Fix probing for already installed Error.pm","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2006-06-30T05:09:23Z","receivedAt":"2006-06-30T05:09:23Z","isPatch":true,"sender":{"key":"proski@gnu.org","avatar":null},"body":"From: Pavel Roskin \n\nSigned-off-by: Pavel Roskin \n---\n\n perl/Makefile.PL | 2 +-\n 1 files changed, 1 insertions(+), 1 deletions(-)\n\ndiff --git a/perl/Makefile.PL b/perl/Makefile.PL\nindex d401a66..b3fbb73 100644\n--- a/perl/Makefile.PL\n+++ b/perl/Makefile.PL\n@@ -12,7 +12,7 @@ my %pm = ('Git.pm' => '$(INST_LIBDIR)/Gi\n \n # We come with our own bundled Error.pm. It's not in the set of default\n # Perl modules so install it if it's not available on the system yet.\n-eval { require 'Error' };\n+eval { require Error };\n if ($@) {\n \t$pm{'Error.pm'} = '$(INST_LIBDIR)/Error.pm';\n }\n"},{"id":"22886","messageId":"20060630050926.701.24647.stgit@dv.roinet.com","threadId":"4719","inReplyTo":"20060630050923.701.37665.stgit@dv.roinet.com","subject":"[PATCH 2/3] Delete manuals if compiling without docs","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2006-06-30T05:09:26Z","receivedAt":"2006-06-30T05:09:26Z","isPatch":true,"sender":{"key":"proski@gnu.org","avatar":null},"body":"From: Pavel Roskin \n\nOtherwise, rpm would complain about unpacked files.\n\nSigned-off-by: Pavel Roskin \n---\n\n git.spec.in | 2 ++\n 1 files changed, 2 insertions(+), 0 deletions(-)\n\ndiff --git a/git.spec.in b/git.spec.in\nindex 8ccd256..b8feda3 100644\n--- a/git.spec.in\n+++ b/git.spec.in\n@@ -86,6 +86,8 @@ make %{_smp_mflags} DESTDIR=$RPM_BUILD_R\n (find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE \"arch|svn|cvs|email|gitk\" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files\n %if %{!?_without_docs:1}0\n (find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE \"arch|svn|git-cvs|email|gitk\" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files\n+%else\n+rm -rf $RPM_BUILD_ROOT%{_mandir}\n %endif\n \n %clean\n"},{"id":"22887","messageId":"20060630050928.701.17817.stgit@dv.roinet.com","threadId":"4719","inReplyTo":"20060630050923.701.37665.stgit@dv.roinet.com","subject":"[PATCH 3/3] Make perl interface a separate package","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2006-06-30T05:09:28Z","receivedAt":"2006-06-30T05:09:28Z","isPatch":true,"sender":{"key":"proski@gnu.org","avatar":null},"body":"From: Pavel Roskin \n\nInstall it as a vendor package. Remove .packlist, perllocal.pod,\nGit.bs. Require perl(Error) for building so that our Error.pm is not\ninstalled.\n\nSigned-off-by: Pavel Roskin \n---\n\n git.spec.in | 21 +++++++++++++++++++--\n 1 files changed, 19 insertions(+), 2 deletions(-)\n\ndiff --git a/git.spec.in b/git.spec.in\nindex b8feda3..6d90034 100644\n--- a/git.spec.in\n+++ b/git.spec.in\n@@ -9,7 +9,7 @@ URL: \t\thttp://kernel.org/pub/software/sc\n Source: \thttp://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz\n BuildRequires:\tzlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3}\n BuildRoot:\t%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)\n-Requires:\tgit-core, git-svn, git-cvs, git-arch, git-email, gitk\n+Requires:\tgit-core, git-svn, git-cvs, git-arch, git-email, gitk, perl-Git\n \n %description\n This is a stupid (but extremely fast) directory content manager. It\n@@ -70,6 +70,16 @@ Requires: git-core = %{version}-%{\n %description -n gitk\n Git revision tree visualiser ('gitk')\n \n+%package -n perl-Git\n+Summary: Perl interface to Git\n+Group: Development/Libraries\n+Requires: git-core = %{version}-%{release}\n+Requires: perl(:MODULE_COMPAT_%(eval \"`%{__perl} -V:version`\"; echo $version))\n+BuildRequires: perl(Error)\n+\n+%description -n perl-Git\n+Perl interface to Git\n+\n %prep\n %setup -q\n \n@@ -80,10 +90,14 @@ make %{_smp_mflags} CFLAGS=\"$RPM_OPT_FLA\n %install\n rm -rf $RPM_BUILD_ROOT\n make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease \\\n- prefix=%{_prefix} mandir=%{_mandir} \\\n+ prefix=%{_prefix} mandir=%{_mandir} INSTALLDIRS=vendor \\\n install %{!?_without_docs: install-doc}\n+find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'\n+find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'\n+find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'\n \n (find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE \"arch|svn|cvs|email|gitk\" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files\n+(find $RPM_BUILD_ROOT%{perl_vendorarch} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files\n %if %{!?_without_docs:1}0\n (find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE \"arch|svn|git-cvs|email|gitk\" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files\n %else\n@@ -131,6 +145,9 @@ # These are no files in the root package\n %{!?_without_docs: %{_mandir}/man1/*gitk*.1*}\n %{!?_without_docs: %doc Documentation/*gitk*.html }\n \n+%files -n perl-Git -f perl-files\n+%defattr(-,root,root)\n+\n %files core -f bin-man-doc-files\n %defattr(-,root,root)\n %{_datadir}/git-core/\n"},{"id":"22894","messageId":"7vfyhnksqf.fsf@assigned-by-dhcp.cox.net","threadId":"4719","inReplyTo":"20060630050923.701.37665.stgit@dv.roinet.com","subject":"Re: [PATCH 1/3] Fix probing for already installed Error.pm","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-06-30T07:28:08Z","receivedAt":"2006-06-30T07:28:08Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Pavel Roskin writes:\n\n> diff --git a/perl/Makefile.PL b/perl/Makefile.PL\n> index d401a66..b3fbb73 100644\n> --- a/perl/Makefile.PL\n> +++ b/perl/Makefile.PL\n> @@ -12,7 +12,7 @@ my %pm = ('Git.pm' => '$(INST_LIBDIR)/Gi\n> \n> # We come with our own bundled Error.pm. It's not in the set of default\n> # Perl modules so install it if it's not available on the system yet.\n> -eval { require 'Error' };\n> +eval { require Error };\n> if ($@) {\n> \t$pm{'Error.pm'} = '$(INST_LIBDIR)/Error.pm';\n> }\n\nThe syntax updates is correct, but this is still wrong, I am\nafraid.\n\nIt is trying to see if we need to install the Error.pm we ship\njust in case the system does not have Error.pm available. But\nthis script is run in perl/ directory where we have that private\ncopy of Error.pm, so \"require Error\" always succeeds, eh, at\nleast after you fixed the above syntax error X-<.\n"},{"id":"22896","messageId":"7vbqsbks69.fsf@assigned-by-dhcp.cox.net","threadId":"4719","inReplyTo":"7vfyhnksqf.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH 1/3] Fix probing for already installed Error.pm","fromName":"Junio C Hamano","fromEmail":"junkio@cox.net","sentAt":"2006-06-30T07:40:14Z","receivedAt":"2006-06-30T07:40:14Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> Pavel Roskin writes:\n>\n>> diff --git a/perl/Makefile.PL b/perl/Makefile.PL\n>> index d401a66..b3fbb73 100644\n>> --- a/perl/Makefile.PL\n>> +++ b/perl/Makefile.PL\n>> @@ -12,7 +12,7 @@ my %pm = ('Git.pm' => '$(INST_LIBDIR)/Gi\n>> \n>> # We come with our own bundled Error.pm. It's not in the set of default\n>> # Perl modules so install it if it's not available on the system yet.\n>> -eval { require 'Error' };\n>> +eval { require Error };\n>> if ($@) {\n>> \t$pm{'Error.pm'} = '$(INST_LIBDIR)/Error.pm';\n>> }\n>\n> The syntax updates is correct, but this is still wrong, I am\n> afraid.\n>\n> It is trying to see if we need to install the Error.pm we ship\n> just in case the system does not have Error.pm available. But\n> this script is run in perl/ directory where we have that private\n> copy of Error.pm, so \"require Error\" always succeeds, eh, at\n> least after you fixed the above syntax error X-<.\n\nThat is, we would want something like this.\n\ndiff --git a/perl/Error.pm b/perl/private-Error.pm\nsimilarity index 100%\nrename from perl/Error.pm\nrename to perl/private-Error.pm\ndiff --git a/perl/Makefile.PL b/perl/Makefile.PL\nindex b3fbb73..25ae54a 100644\n--- a/perl/Makefile.PL\n+++ b/perl/Makefile.PL\n@@ -14,7 +14,7 @@ # We come with our own bundled Error.pm.\n # Perl modules so install it if it's not available on the system yet.\n eval { require Error };\n if ($@) {\n-\t$pm{'Error.pm'} = '$(INST_LIBDIR)/Error.pm';\n+\t$pm{'private-Error.pm'} = '$(INST_LIBDIR)/Error.pm';\n }\n \n WriteMakefile(\n"},{"id":"22938","messageId":"1151690891.11093.0.camel@dv","threadId":"4719","inReplyTo":"7vbqsbks69.fsf@assigned-by-dhcp.cox.net","subject":"Re: [PATCH 1/3] Fix probing for already installed Error.pm","fromName":"Pavel Roskin","fromEmail":"proski@gnu.org","sentAt":"2006-06-30T18:08:11Z","receivedAt":"2006-06-30T18:08:11Z","isPatch":true,"sender":{"key":"proski@gnu.org","avatar":null},"body":"On Fri, 2006-06-30 at 00:40 -0700, Junio C Hamano wrote:\n> > It is trying to see if we need to install the Error.pm we ship\n> > just in case the system does not have Error.pm available. But\n> > this script is run in perl/ directory where we have that private\n> > copy of Error.pm, so \"require Error\" always succeeds, eh, at\n> > least after you fixed the above syntax error X-<.\n\nNice catch! Thank you for fixing it.\n\n-- \nRegards,\nPavel Roskin\n"}]}