Attachment 923401 Details for Bug 1124994 – patch, adding a conditional CLI sub-package

[patch] patch, adding a conditional CLI sub-package

add-cli.patch (text/plain), 2.94 KB, created by R P Herrold on 2014-08-01 18:54:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: R P Herrold

Created: 2014-08-01 18:54:42 UTC

Size: 2.94 KB

patch

obsolete

>--- dl.spec-3	2014-08-01 10:51:41.452383001 -0400
>+++ dl-cli.spec	2014-08-01 14:52:18.032383001 -0400
>@@ -1,11 +1,36 @@
> %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
>+#
>+#	the sub-packages of 'dl' need Pyton 2.7 or later ... 
>+%global pyhexver %(python -c 'import sys ; print sys.hexversion ')
>+#
>+#	in python this test is easy: in RPM spec % if's not so much
>+#	if sys.hexversion < 0x02070000: 
>+#		print "pyslet requires Python Version 2.7 (or greater)"
>+#	so we build a constant for 0x02070000
>+#	python -c 'import sys ; print (0x02070000)'
>+%global py270 34013184
>+#
>+#	the fully qualified Python version number is a guaranteed 
>+#	monotonically increasing version number, composed solely of 
>+#	0..9, and so conventional comparison friendly
>+#	To view a a hex number use: 
>+#		python -c 'import sys ; print hex(sys.hexversion) '
>+#	2.6.6 is: 33949424
>+#	2.7.0 would be: 34013184
>+#	see: https://docs.python.org/2/library/sys.html
>+# echo "%{pyhexver}"
>+# exit 1
>+%global buildsubs 0
>+%if 0%{?pyhexver} >= 0%{py270}
>+%global buildsubs 1
>+%endif
> 
> Summary:    Download Ticket Service
> URL:        http://www.thregr.org/~wavexx/software/dl/
> Name:       dl
> Version:    0.13
> Group:      Applications/Internet
>-Release:    3%{?dist}
>+Release:    4%{?dist}
> License:    GPLv2+
> 
> Source0:    http://www.thregr.org/~wavexx/software/dl/releases/dl-%{version}.zip
>@@ -42,12 +67,28 @@
> dl is usually installed as a "email attachments replacement" due to its
> simplicity (though can be used in other ways).
> 
>+%if 0%{?buildsubs}
>+%package -n cli
>+Summary: Provides CLI dl management client
>+Group: 	Applications/Internet
>+#	keep in sync with the parent
>+Requires: %{name} = %{version}-%{release}
>+
>+%description -n cli
>+The command line tool for dl
>+
>+%endif
>+
> %prep
> %setup -q
> 
> %patch0 -p1
> 
> %build
>+#	sub-packages
>+#	this needs some hoop-jumping to conditionally be built only
>+#	when Python is at or above 2.7
>+
> # Cleanup
> rm -f client/thunderbird-filelink-dl/.gitignore
> rm -f htdocs/include/.htaccess
>@@ -82,6 +123,16 @@
> 
> cp -p %{SOURCE2} ./README.fedora
> 
>+%if 0%{?buildsubs}
>+[ ! -d ${RPM_BUILD_ROOT}%{_bindir} ] && mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
>+for i in ` find . -name "dl-cli.py" | grep "client/dl-cli.py" ` ; do
>+	mv ${i} ${RPM_BUILD_ROOT}%{_bindir}
>+#	we need to selectively pull stuff packaged, leaving 
>+#		not yet packaged matter to be retained in % doc
>+	rm -f ${i} 
>+done
>+%endif
>+
> %post
> # selinux: allow PHP to read/write data directory
> semanage fcontext -a -t httpd_sys_rw_content_t "%{_localstatedir}/spool/dl(/.*)?"
>@@ -115,7 +166,16 @@
> %dir %attr(0700,apache,apache) %{_localstatedir}/spool/dl
> %dir %attr(0755,apache,apache) %{_localstatedir}/spool/dl/data
> 
>+%if 0%{?buildsubs}
>+%files -n cli
>+%defattr(-,root,root,-)
>+%{_bindir}/dl-cli.py
>+%endif
>+
> %changelog
>+* Fri Aug  1 2014 R P Herrold <info@owlriver.com> - 0.13-4
>+- add cli sub-package
>+
> * Fri Aug  1 2014 Greg Bailey <gbailey@lxpro.com> - 0.13-3
> - Unbundle php-phpass and php-php-gettext
>

Actions: View | Diff

Attachments on bug 1124994: 923333 | 923401