@matheusbsbs / matheus-bagliano / commits / 0867b0125a
Fork 0

specfile cleanups

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 <chrisw@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>

Chris Wright committed Nov 11, 2005 at 01:10 UTC 0867b0125a7b0ed02c7850486393c56ae8a719e3
1 file changed +39 -11
git-core.spec.in
+39 -11
@@ -1,4 +1,4 @@
1 -# Pass --without docs to rpmbuild if you don't want the documetnation
1 +# Pass --without docs to rpmbuild if you don't want the documentation
2 Name: git-core
3 Version: @@VERSION@@
4 Release: 1%{?dist}
@@ -7,7 +7,7 @@ License: GPL
7 Group: Development/Tools
8 URL: http://kernel.org/pub/software/scm/git/
9 Source: http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
10 -BuildRequires: zlib-devel, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
10 +BuildRequires: zlib-devel >= 1.2, openssl-devel, curl-devel %{!?_without_docs:, xmlto, asciidoc > 6.0.3}
11 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
12 Requires: zlib >= 1.2, rsync, rcs, curl, less, openssh-clients, python >= 2.3, tk >= 8.4
13
@@ -20,23 +20,30 @@ rudimentary tools that can be used as a SCM, but you should look
20 elsewhere for tools for ordinary humans layered on top of this.
21
22 %package svn
23 -Summary: Git tools for importing Subversion repositories.
23 +Summary: Git tools for importing Subversion repositories
24 Group: Development/Tools
25 -Requires: git-core, subversion
25 +Requires: git-core = %{version}-%{release}, subversion
26 %description svn
27 Git tools for importing Subversion repositories.
28
29 %package cvs
30 -Summary: Git tools for importing CVS repositories.
30 +Summary: Git tools for importing CVS repositories
31 Group: Development/Tools
32 -Requires: git-core, cvs, cvsps
32 +Requires: git-core = %{version}-%{release}, cvs, cvsps
33 %description cvs
34 Git tools for importing CVS repositories.
35
36 +%package arch
37 +Summary: Git tools for importing Arch repositories
38 +Group: Development/Tools
39 +Requires: git-core = %{version}-%{release}
40 +%description arch
41 +Git tools for importing Arch repositories.
42 +
43 %package email
37 -Summary: Git tools for sending email.
44 +Summary: Git tools for sending email
45 Group: Development/Tools
39 -Requires: git-core
46 +Requires: git-core = %{version}-%{release}
47 %description email
48 Git tools for sending email.
49
@@ -53,33 +60,54 @@ make %{_smp_mflags} DESTDIR=$RPM_BUILD_ROOT WITH_OWN_SUBPROCESS_PY=YesPlease WIT
60 prefix=%{_prefix} mandir=%{_mandir} \
61 install %{!?_without_docs: install-doc}
62
56 -(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "svn|cvs|email" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-files
63 +(find $RPM_BUILD_ROOT%{_bindir} -type f | grep -vE "arch|svn|cvs|email" | sed -e s@^$RPM_BUILD_ROOT@@) > bin-man-doc-files
64 %if %{!?_without_docs:1}0
58 -(find $RPM_BUILD_ROOT%{_mandir} -type f | grep -vE "svn|cvs|email" | sed -e s@^$RPM_BUILD_ROOT@@ -e 's/$/*/' ) >> bin-man-files
65 +(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
66 %endif
67
68 %clean
69 rm -rf $RPM_BUILD_ROOT
70
71 %files svn
72 +%defattr(-,root,root)
73 %{_bindir}/*svn*
74 +%doc Documentation/*svn*.txt
75 %{!?_without_docs: %{_mandir}/man1/*svn*.1*}
76 +%{!?_without_docs: %doc Documentation/*svn*.html }
77
78 %files cvs
79 +%defattr(-,root,root)
80 +%doc Documentation/*git-cvs*.txt
81 %{_bindir}/*cvs*
82 %{!?_without_docs: %{_mandir}/man1/*cvs*.1*}
83 +%{!?_without_docs: %doc Documentation/*git-cvs*.html }
84 +
85 +%files arch
86 +%defattr(-,root,root)
87 +%doc Documentation/*arch*.txt
88 +%{_bindir}/*arch*
89 +%{!?_without_docs: %{_mandir}/man1/*arch*.1*}
90 +%{!?_without_docs: %doc Documentation/*arch*.html }
91
92 %files email
93 +%defattr(-,root,root)
94 +%doc Documentation/*email*.txt
95 %{_bindir}/*email*
96 %{!?_without_docs: %{_mandir}/man1/*email*.1*}
97 +%{!?_without_docs: %doc Documentation/*email*.html }
98
76 -%files -f bin-man-files
99 +%files -f bin-man-doc-files
100 %defattr(-,root,root)
101 %{_datadir}/git-core/
102 %doc README COPYING Documentation/*.txt
103 %{!?_without_docs: %doc Documentation/*.html }
104
105 %changelog
106 +* Thu Nov 10 2005 Chris Wright <chrisw@osdl.org> 0.99.9g-1
107 +- zlib dependency fix
108 +- Minor cleanups from split
109 +- Move arch import to separate package as well
110 +
111 * Tue Sep 27 2005 Jim Radford <radford@blackbean.org>
112 - Move programs with non-standard dependencies (svn, cvs, email)
113 into separate packages