From 610fb12842d9e84b7283b899a4e4f0392924a33daf06d70bb647dce27336fc4d Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Tue, 5 Feb 2013 14:40:33 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive-filesystem?expand=0&rev=25 --- texlive-filesystem.spec | 11 ++++------- zypplugin.in | 19 ++++--------------- 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/texlive-filesystem.spec b/texlive-filesystem.spec index b32d705..2176960 100644 --- a/texlive-filesystem.spec +++ b/texlive-filesystem.spec @@ -18,7 +18,7 @@ %define texlive_version 2012 %define texlive_release 20120611 -%define texlive_noarch 60 +%define texlive_noarch 61 %define texlive_source texlive-20120611-source %define __perl_requires %{nil} @@ -33,8 +33,7 @@ License: GPL-2.0+ and GPL-2.0 and GPL-3.0 and LPPL-1.3c and LPPL-1.0 and Group: Productivity/Publishing/TeX/Base Url: http://www.tug.org/texlive/ Requires: cron -Requires: zypp-plugin-python -Requires: libzypp(plugin:commit) +Requires: python Requires(pre): /usr/bin/getent Requires(pre): /usr/sbin/groupadd Requires(post): %fillup_prereq @@ -51,7 +50,6 @@ Requires(verify): permissions Obsoletes: tetex BuildRequires: ed BuildRequires: fontconfig -BuildRequires: libzypp(plugin:commit) #BuildConflicts: texinfo Source10: rc.config.texlive Source11: update.texlive @@ -4079,7 +4077,6 @@ popd mkdir -p %{buildroot}%{_fontcache}/tfm mkdir -p %{buildroot}%{_appdefdir} mkdir -p %{buildroot}%{_sysconfdir}/permissions.d - mkdir -p %{buildroot}%{_libexecdir}/zypp/plugins mkdir -p %{buildroot}%{_texmfdistdir}/bibtex/bib/IEEEtran mkdir -p %{buildroot}%{_texmfdistdir}/bibtex/bib/abstyles mkdir -p %{buildroot}%{_texmfdistdir}/bibtex/bib/amsrefs @@ -10836,7 +10833,7 @@ popd %{_fontcache}/tfm/ root:%{texgrp} 1775 EOF - sed -r 's@%%\{_texmfmaindir\}@%{_texmfmaindir}@' < %{S:42} > %{buildroot}%{_libexecdir}/zypp/plugins/texlive.py + sed -r 's@%%\{_texmfmaindir\}@%{_texmfmaindir}@' < %{S:42} > %{buildroot}%{_texmfmaindir}/texconfig/zypper.py # enviroment mkdir -p %{buildroot}%{_sysconfdir}/profile.d @@ -10973,7 +10970,7 @@ fi %dir %{_texmfmaindir}/xdvi/pixmap %dir %{_texmfmaindir}/texconfig %attr(0755,root,root) %{_texmfmaindir}/texconfig/update -%attr(0755,root,root) %{_libexecdir}/zypp/plugins/texlive.py +%attr(0755,root,root) %{_texmfmaindir}/texconfig/zypper.py %dir %{_texmfmaindir}/asymptote %dir %{_texmfmaindir}/asymptote/GUI %dir %{_texmfdistdir} diff --git a/zypplugin.in b/zypplugin.in index 3f00c8f..a3215ea 100644 --- a/zypplugin.in +++ b/zypplugin.in @@ -1,6 +1,6 @@ #!/usr/bin/python # -# /usr/lib/zypp/plugins/commit/texlive.py +# $TEXMFMAIN/texconfig/zypper.py # # The substitute for the %posttrans scriptlets used by rpm. # Make sure that the update script does its work only once after @@ -15,22 +15,11 @@ # from os import listdir, path, access, F_OK,R_OK,X_OK from subprocess import call -from zypp_plugin import Plugin global update, tagdir update = "%{_texmfmaindir}/texconfig/update" tagdir = "/var/run/texlive" -class MyPlugin(Plugin): - - def PLUGINBEGIN(self, headers, body): - self.ack() - - def PLUGINEND(self, headers, body): - if access(update, F_OK|X_OK): - if path.isdir(tagdir) and listdir(tagdir): - call("VERBOSE=false " + update + " 2>&1 || :", shell=True) - self.ack() - -plugin = MyPlugin() -plugin.main() +if access(update, F_OK|X_OK): + if path.isdir(tagdir) and listdir(tagdir): + call("VERBOSE=false " + update + " 2>&1 || :", shell=True)