Remove p4 rpm from git.spec.in.
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sean committed
Jul 15, 2007 at 15:51 UTC
21ad54467a41f742491bc1d6223e9dd944ce8c97
1 file changed
+9
-20
git.spec.in
+9
-20
@@ -12,7 +12,7 @@ URL: http://kernel.org/pub/software/scm/git/
12
Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
13
BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel, expat-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
14
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
15
-Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, git-p4, perl-Git
15
+Requires: git-core, git-svn, git-cvs, git-arch, git-email, gitk, git-gui, perl-Git
16
17
%description
18
Git is a fast, scalable, distributed revision control system with an
@@ -53,13 +53,6 @@ Requires: git-core = %{version}-%{release}, tla
53
%description arch
54
Git tools for importing Arch repositories.
55
56
-%package p4
57
-Summary: Git tools for importing Perforce repositories
58
-Group: Development/Tools
59
-Requires: git-core = %{version}-%{release}, python
60
-%description p4
61
-Git tools for importing Perforce repositories.
62
-
56
%package email
57
Summary: Git tools for sending email
58
Group: Development/Tools
@@ -95,14 +88,14 @@ Perl interface to Git
88
%setup -q
89
90
%build
98
-make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" WITH_P4IMPORT=YesPlease \
91
+make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" \
92
ETC_GITCONFIG=/etc/gitconfig \
100
- prefix=%{_prefix} PYTHON_PATH=%{python_path} all %{!?_without_docs: doc}
93
+ prefix=%{_prefix} all %{!?_without_docs: doc}
94
95
%install
96
rm -rf $RPM_BUILD_ROOT
97
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS" DESTDIR=$RPM_BUILD_ROOT \
105
- WITH_P4IMPORT=YesPlease prefix=%{_prefix} mandir=%{_mandir} \
98
+ prefix=%{_prefix} mandir=%{_mandir} \
99
ETC_GITCONFIG=/etc/gitconfig \
100
PYTHON_PATH=%{python_path} \
101
INSTALLDIRS=vendor install %{!?_without_docs: install-doc}
@@ -110,10 +103,10 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
103
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
104
find $RPM_BUILD_ROOT -type f -name perllocal.pod -exec rm -f {} ';'
105
113
-(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "p4import|archimport|svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
106
+(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "archimport|svn|cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
107
(find $RPM_BUILD_ROOT%{perl_vendorlib} -type f | sed -e s@^$RPM_BUILD_ROOT@@) >> perl-files
108
%if %{!?_without_docs:1}0
116
-(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "p4import|archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
109
+(find $RPM_BUILD_ROOT%{_mandir} $RPM_BUILD_ROOT/Documentation -type f | grep -vE "archimport|svn|git-cvs|email|gitk|git-gui|git-citool" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-doc-files
110
%else
111
rm -rf $RPM_BUILD_ROOT%{_mandir}
112
%endif
@@ -145,13 +138,6 @@ rm -rf $RPM_BUILD_ROOT
138
%{!?_without_docs: %{_mandir}/man1/git-archimport.1*}
139
%{!?_without_docs: %doc Documentation/git-archimport.html }
140
148
-%files p4
149
-%defattr(-,root,root)
150
-%doc Documentation/git-p4import.txt
151
-%{_bindir}/git-p4import
152
-%{!?_without_docs: %{_mandir}/man1/git-p4import.1*}
153
-%{!?_without_docs: %doc Documentation/git-p4import.html }
154
-
141
%files email
142
%defattr(-,root,root)
143
%doc Documentation/*email*.txt
@@ -187,6 +173,9 @@ rm -rf $RPM_BUILD_ROOT
173
%{!?_without_docs: %doc Documentation/technical}
174
175
%changelog
176
+* Sun Jul 15 2007 Sean Estabrooks <seanlkml@sympatico.ca>
177
+- Removed p4import.
178
+
179
* Tue Jun 26 2007 Quy Tonthat <qtonthat@gmail.com>
180
- Fixed problems looking for wrong manpages.
181