From 7cfbde7a5e378dec415b7151b37ba529260eaa983882be2693d8b57ced52b7b4 Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 12 Oct 2015 11:31:59 +0000 Subject: [PATCH 1/2] Accepting request 338122 from home:TheBlackCat:branches:devel:languages:python Implement update-alternatives in preparation for python 3 version OBS-URL: https://build.opensuse.org/request/show/338122 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Twisted?expand=0&rev=40 --- python-Twisted.changes | 5 ++ python-Twisted.spec | 104 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 108 insertions(+), 1 deletion(-) diff --git a/python-Twisted.changes b/python-Twisted.changes index cc2bdc8..b64ff77 100644 --- a/python-Twisted.changes +++ b/python-Twisted.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 12 10:19:03 UTC 2015 - toddrme2178@gmail.com + +- Implement update-alternatives in preparation for python 3 version. + ------------------------------------------------------------------- Sat Sep 12 21:51:40 UTC 2015 - termim@gmail.com diff --git a/python-Twisted.spec b/python-Twisted.spec index 7a739c6..72ff15e 100644 --- a/python-Twisted.spec +++ b/python-Twisted.spec @@ -45,6 +45,7 @@ Provides: python-twisted-core = %{version} Obsoletes: python-twisted-core < %{version} Provides: python-twisted-conch = %{version} Obsoletes: python-twisted-conch < %{version} +Provides: python-twisted-lore < %{version} Obsoletes: python-twisted-lore < %{version} Provides: python-twisted-mail = %{version} Obsoletes: python-twisted-mail < %{version} @@ -60,6 +61,8 @@ Provides: python-twisted-words = %{version} Obsoletes: python-twisted-words < %{version} Provides: python-twisted-xish = %{version} Obsoletes: python-twisted-xish < %{version} +Requires(post): update-alternatives +Requires(postun): update-alternatives %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} %endif @@ -93,6 +96,51 @@ install -m0644 doc/*/man/*.1 %{buildroot}/%{_mandir}/man1/ # Install man pages find doc -type f -print0 | xargs -0 chmod a-x # Fix doc-file dependency by removing x flags sed -i "s/\r//" doc/_downloads/{MulticastClient,MulticastServer}.py +# Prepare for update-alternatives usage +mkdir -p %{buildroot}%{_sysconfdir}/alternatives +for p in cftp ckeygen conch mailmail manhole pyhtmlizer tap2deb tap2rpm tkconch trial twistd ; do + mv %{buildroot}%{_bindir}/$p %{buildroot}%{_bindir}/$p-%{py_ver} + ln -s -f %{_sysconfdir}/alternatives/$p %{buildroot}%{_bindir}/$p + # create a dummy target for /etc/alternatives/$p + touch %{buildroot}%{_sysconfdir}/alternatives/$p + + gzip %{buildroot}%{_mandir}/man1/$p.1 + mv %{buildroot}%{_mandir}/man1/$p.1.gz %{buildroot}%{_mandir}/man1/$p-%{py_ver}.1.gz + ln -s -f %{_sysconfdir}/alternatives/$p.1.gz %{buildroot}%{_mandir}/man1/$p.1.gz + # create a dummy target for /etc/alternatives/$p.1.gz + touch %{buildroot}%{_sysconfdir}/alternatives/$p.1.gz +done + +%post +%_sbindir/update-alternatives \ + --install %{_bindir}/twistd twistd %{_bindir}/twistd-%{py_ver} 30 \ + --slave %{_bindir}/cftp cftp %{_bindir}/cftp-%{py_ver} \ + --slave %{_bindir}/ckeygen ckeygen %{_bindir}/ckeygen-%{py_ver} \ + --slave %{_bindir}/conch conch %{_bindir}/conch-%{py_ver} \ + --slave %{_bindir}/mailmail mailmail %{_bindir}/mailmail-%{py_ver} \ + --slave %{_bindir}/manhole manhole %{_bindir}/manhole-%{py_ver} \ + --slave %{_bindir}/pyhtmlizer pyhtmlizer %{_bindir}/pyhtmlizer-%{py_ver} \ + --slave %{_bindir}/tap2deb tap2deb %{_bindir}/tap2deb-%{py_ver} \ + --slave %{_bindir}/tap2rpm tap2rpm %{_bindir}/tap2rpm-%{py_ver} \ + --slave %{_bindir}/tkconch tkconch %{_bindir}/tkconch-%{py_ver} \ + --slave %{_bindir}/trial trial %{_bindir}/trial-%{py_ver} \ + --slave %{_mandir}/man1/twistd.1.gz twistd.1.gz %{_mandir}/man1/twistd-%{py_ver}.1.gz \ + --slave %{_mandir}/man1/cftp.1.gz cftp.1.gz %{_mandir}/man1/cftp-%{py_ver}.1.gz \ + --slave %{_mandir}/man1/ckeygen.1.gz ckeygen.1.gz %{_mandir}/man1/ckeygen-%{py_ver}.1.gz \ + --slave %{_mandir}/man1/conch.1.gz conch.1.gz %{_mandir}/man1/conch-%{py_ver}.1.gz \ + --slave %{_mandir}/man1/mailmail.1.gz mailmail.1.gz %{_mandir}/man1/mailmail-%{py_ver}.1.gz \ + --slave %{_mandir}/man1/manhole.1.gz manhole.1.gz %{_mandir}/man1/manhole-%{py_ver}.1.gz \ + --slave %{_mandir}/man1/pyhtmlizer.1.gz pyhtmlizer.1.gz %{_mandir}/man1/pyhtmlizer-%{py_ver}.1.gz \ + --slave %{_mandir}/man1/tap2deb.1.gz tap2deb.1.gz %{_mandir}/man1/tap2deb-%{py_ver}.1.gz \ + --slave %{_mandir}/man1/tap2rpm.1.gz tap2rpm.1.gz %{_mandir}/man1/tap2rpm-%{py_ver}.1.gz \ + --slave %{_mandir}/man1/tkconch.1.gz tkconch.1.gz %{_mandir}/man1/ctkconchftp-%{py_ver}.1.gz \ + --slave %{_mandir}/man1/trial.1.gz trial.1.gz %{_mandir}/man1/trial-%{py_ver}.1.gz + +%postun +if [ $1 -eq 0 ] ; then + %_sbindir/update-alternatives --remove twistd %{_bindir}/twistd-%{py_ver} +fi + %files doc %defattr(-,root,root,-) %doc doc/* @@ -111,7 +159,61 @@ sed -i "s/\r//" doc/_downloads/{MulticastClient,MulticastServer}.py %{_bindir}/tkconch %{_bindir}/trial %{_bindir}/twistd -%{_mandir}/man1/* +%{_bindir}/cftp-%{py_ver} +%{_bindir}/ckeygen-%{py_ver} +%{_bindir}/conch-%{py_ver} +%{_bindir}/mailmail-%{py_ver} +%{_bindir}/manhole-%{py_ver} +%{_bindir}/pyhtmlizer-%{py_ver} +%{_bindir}/tap2deb-%{py_ver} +%{_bindir}/tap2rpm-%{py_ver} +%{_bindir}/tkconch-%{py_ver} +%{_bindir}/trial-%{py_ver} +%{_bindir}/twistd-%{py_ver} +%{_mandir}/man1/cftp.1.gz +%{_mandir}/man1/ckeygen.1.gz +%{_mandir}/man1/conch.1.gz +%{_mandir}/man1/mailmail.1.gz +%{_mandir}/man1/manhole.1.gz +%{_mandir}/man1/pyhtmlizer.1.gz +%{_mandir}/man1/tap2deb.1.gz +%{_mandir}/man1/tap2rpm.1.gz +%{_mandir}/man1/tkconch.1.gz +%{_mandir}/man1/trial.1.gz +%{_mandir}/man1/twistd.1.gz +%{_mandir}/man1/cftp-%{py_ver}.1.gz +%{_mandir}/man1/ckeygen-%{py_ver}.1.gz +%{_mandir}/man1/conch-%{py_ver}.1.gz +%{_mandir}/man1/mailmail-%{py_ver}.1.gz +%{_mandir}/man1/manhole-%{py_ver}.1.gz +%{_mandir}/man1/pyhtmlizer-%{py_ver}.1.gz +%{_mandir}/man1/tap2deb-%{py_ver}.1.gz +%{_mandir}/man1/tap2rpm-%{py_ver}.1.gz +%{_mandir}/man1/tkconch-%{py_ver}.1.gz +%{_mandir}/man1/trial-%{py_ver}.1.gz +%{_mandir}/man1/twistd-%{py_ver}.1.gz +%ghost %{_sysconfdir}/alternatives/cftp +%ghost %{_sysconfdir}/alternatives/ckeygen +%ghost %{_sysconfdir}/alternatives/conch +%ghost %{_sysconfdir}/alternatives/mailmail +%ghost %{_sysconfdir}/alternatives/manhole +%ghost %{_sysconfdir}/alternatives/pyhtmlizer +%ghost %{_sysconfdir}/alternatives/tap2deb +%ghost %{_sysconfdir}/alternatives/tap2rpm +%ghost %{_sysconfdir}/alternatives/tkconch +%ghost %{_sysconfdir}/alternatives/trial +%ghost %{_sysconfdir}/alternatives/twistd +%ghost %{_sysconfdir}/alternatives/cftp.1.gz +%ghost %{_sysconfdir}/alternatives/ckeygen.1.gz +%ghost %{_sysconfdir}/alternatives/conch.1.gz +%ghost %{_sysconfdir}/alternatives/mailmail.1.gz +%ghost %{_sysconfdir}/alternatives/manhole.1.gz +%ghost %{_sysconfdir}/alternatives/pyhtmlizer.1.gz +%ghost %{_sysconfdir}/alternatives/tap2deb.1.gz +%ghost %{_sysconfdir}/alternatives/tap2rpm.1.gz +%ghost %{_sysconfdir}/alternatives/tkconch.1.gz +%ghost %{_sysconfdir}/alternatives/trial.1.gz +%ghost %{_sysconfdir}/alternatives/twistd.1.gz %{python_sitearch}/* %changelog From 7e349bdbcbe531b983fc725009cb3ac15e2b78f383645efb1bdc4fc3d799c952 Mon Sep 17 00:00:00 2001 From: Todd R Date: Mon, 12 Oct 2015 12:04:30 +0000 Subject: [PATCH 2/2] Accepting request 338131 from home:TheBlackCat:branches:devel:languages:python Make "trial" the master file for update-alternatives, since it is the only one that supports python 3 so far. OBS-URL: https://build.opensuse.org/request/show/338131 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-Twisted?expand=0&rev=41 --- python-Twisted.changes | 6 ++++++ python-Twisted.spec | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/python-Twisted.changes b/python-Twisted.changes index b64ff77..adb97ac 100644 --- a/python-Twisted.changes +++ b/python-Twisted.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 12 11:57:51 UTC 2015 - toddrme2178@gmail.com + +- Make "trial" the master file for update-alternatives, since it + is the only one that supports python 3 so far. + ------------------------------------------------------------------- Mon Oct 12 10:19:03 UTC 2015 - toddrme2178@gmail.com diff --git a/python-Twisted.spec b/python-Twisted.spec index 72ff15e..53a1ccf 100644 --- a/python-Twisted.spec +++ b/python-Twisted.spec @@ -113,7 +113,7 @@ done %post %_sbindir/update-alternatives \ - --install %{_bindir}/twistd twistd %{_bindir}/twistd-%{py_ver} 30 \ + --install %{_bindir}/trial trial %{_bindir}/trial-%{py_ver} 30 \ --slave %{_bindir}/cftp cftp %{_bindir}/cftp-%{py_ver} \ --slave %{_bindir}/ckeygen ckeygen %{_bindir}/ckeygen-%{py_ver} \ --slave %{_bindir}/conch conch %{_bindir}/conch-%{py_ver} \ @@ -123,8 +123,8 @@ done --slave %{_bindir}/tap2deb tap2deb %{_bindir}/tap2deb-%{py_ver} \ --slave %{_bindir}/tap2rpm tap2rpm %{_bindir}/tap2rpm-%{py_ver} \ --slave %{_bindir}/tkconch tkconch %{_bindir}/tkconch-%{py_ver} \ - --slave %{_bindir}/trial trial %{_bindir}/trial-%{py_ver} \ - --slave %{_mandir}/man1/twistd.1.gz twistd.1.gz %{_mandir}/man1/twistd-%{py_ver}.1.gz \ + --slave %{_bindir}/twistd twistd %{_bindir}/twistd-%{py_ver} \ + --slave %{_mandir}/man1/trial.1.gz trial.1.gz %{_mandir}/man1/trial-%{py_ver}.1.gz \ --slave %{_mandir}/man1/cftp.1.gz cftp.1.gz %{_mandir}/man1/cftp-%{py_ver}.1.gz \ --slave %{_mandir}/man1/ckeygen.1.gz ckeygen.1.gz %{_mandir}/man1/ckeygen-%{py_ver}.1.gz \ --slave %{_mandir}/man1/conch.1.gz conch.1.gz %{_mandir}/man1/conch-%{py_ver}.1.gz \ @@ -134,11 +134,11 @@ done --slave %{_mandir}/man1/tap2deb.1.gz tap2deb.1.gz %{_mandir}/man1/tap2deb-%{py_ver}.1.gz \ --slave %{_mandir}/man1/tap2rpm.1.gz tap2rpm.1.gz %{_mandir}/man1/tap2rpm-%{py_ver}.1.gz \ --slave %{_mandir}/man1/tkconch.1.gz tkconch.1.gz %{_mandir}/man1/ctkconchftp-%{py_ver}.1.gz \ - --slave %{_mandir}/man1/trial.1.gz trial.1.gz %{_mandir}/man1/trial-%{py_ver}.1.gz + --slave %{_mandir}/man1/twistd.1.gz twistd.1.gz %{_mandir}/man1/twistd-%{py_ver}.1.gz %postun if [ $1 -eq 0 ] ; then - %_sbindir/update-alternatives --remove twistd %{_bindir}/twistd-%{py_ver} + %_sbindir/update-alternatives --remove trial %{_bindir}/trial-%{py_ver} fi %files doc