From 06adcb10e2da8244e2aad67ceaf094d84d38013d Mon Sep 17 00:00:00 2001 From: Alexander Pyhalov Date: Tue, 28 Jun 2016 16:01:55 +0300 Subject: [PATCH] gnome-doc-utils: switch to Python 2.7 --- .../{ => developer}/gnome-doc-utils/Makefile | 20 ++++++++++++----- .../gnome-doc-utils/gnome-doc-utils.license | 4 +--- .../gnome-doc-utils/gnome-doc-utils.p5m | 26 +++++++++++----------- 3 files changed, 28 insertions(+), 22 deletions(-) rename components/{ => developer}/gnome-doc-utils/Makefile (69%) rename components/{ => developer}/gnome-doc-utils/gnome-doc-utils.license (99%) rename components/{ => developer}/gnome-doc-utils/gnome-doc-utils.p5m (95%) diff --git a/components/gnome-doc-utils/Makefile b/components/developer/gnome-doc-utils/Makefile similarity index 69% rename from components/gnome-doc-utils/Makefile rename to components/developer/gnome-doc-utils/Makefile index 57d1e9762..e1b529c3f 100644 --- a/components/gnome-doc-utils/Makefile +++ b/components/developer/gnome-doc-utils/Makefile @@ -9,13 +9,14 @@ # # -# Copyright (c) 2014 Alexander Pyhalov. All rights reserved +# Copyright 2016 Alexander Pyhalov # -include ../../make-rules/shared-macros.mk +include ../../../make-rules/shared-macros.mk COMPONENT_NAME= gnome-doc-utils COMPONENT_VERSION= 0.20.10 +COMPONENT_REVISION= 1 COMPONENT_PROJECT_URL= http://www.gnome.org COMPONENT_SUMMARY= Documentation utilities for GNOME COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) @@ -28,14 +29,20 @@ include $(WS_TOP)/make-rules/prep.mk include $(WS_TOP)/make-rules/configure.mk include $(WS_TOP)/make-rules/ips.mk +PYTHON_VERSION=2.7 + PATH=/usr/gnu/bin:/usr/bin -gcc_OPT = -O2 +# Missing files in build dir for xml2po without this. +COMPONENT_PRE_CONFIGURE_ACTION = ($(CLONEY) $(SOURCE_DIR) $(@D)) CONFIGURE_OPTIONS+= --sysconfdir=/etc CONFIGURE_ENV+= PERL=$(PERL) CONFIGURE_ENV+= PYTHON=$(PYTHON) +CONFIGURE_ENV+= am_cv_python_pythondir="$(PYTHON.$(PYTHON_VERSION).VENDOR_PACKAGES.32)" + +COMPONENT_BUILD_ARGS += V=1 # common targets build: $(BUILD_32) @@ -44,6 +51,7 @@ install: $(INSTALL_32) test: $(NO_TESTS) -BUILD_PKG_DEPENDENCIES = $(BUILD_TOOLS) - -include $(WS_TOP)/make-rules/depend.mk +REQUIRED_PACKAGES += SUNWcs +REQUIRED_PACKAGES += library/python-2/libxml2-27 +REQUIRED_PACKAGES += runtime/python-27 +REQUIRED_PACKAGES += shell/bash diff --git a/components/gnome-doc-utils/gnome-doc-utils.license b/components/developer/gnome-doc-utils/gnome-doc-utils.license similarity index 99% rename from components/gnome-doc-utils/gnome-doc-utils.license rename to components/developer/gnome-doc-utils/gnome-doc-utils.license index d6a4eea2f..3cbd25cbb 100644 --- a/components/gnome-doc-utils/gnome-doc-utils.license +++ b/components/developer/gnome-doc-utils/gnome-doc-utils.license @@ -595,7 +595,7 @@ such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. - + 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an @@ -949,5 +949,3 @@ necessary. Here is a sample; alter the names: Ty Coon, President of Vice That's all there is to it! - - diff --git a/components/gnome-doc-utils/gnome-doc-utils.p5m b/components/developer/gnome-doc-utils/gnome-doc-utils.p5m similarity index 95% rename from components/gnome-doc-utils/gnome-doc-utils.p5m rename to components/developer/gnome-doc-utils/gnome-doc-utils.p5m index 0553fd11d..e15b9d1ce 100644 --- a/components/gnome-doc-utils/gnome-doc-utils.p5m +++ b/components/developer/gnome-doc-utils/gnome-doc-utils.p5m @@ -10,7 +10,7 @@ # # -# Copyright 2014 Alexander Pyhalov. All rights reserved. +# Copyright 2016 Alexander Pyhalov # set name=pkg.fmri value=pkg:/developer/gnome/gnome-doc-utils@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) @@ -24,21 +24,21 @@ set name=org.opensolaris.consolidation value=$(CONSOLIDATION) license gnome-doc-utils.license license="GPLv2, LGPLv2" -depend fmri=library/python-2/libxml2-26 type=require +depend fmri=library/python-2/libxml2-27 type=require depend fmri=library/libxml2 type=require depend fmri=library/libxslt type=require -file path=usr/bin/gnome-doc-prepare mode=0555 -file path=usr/bin/gnome-doc-tool mode=0555 -file path=usr/bin/xml2po mode=0555 -file path=usr/lib/python2.6/site-packages/xml2po/__init__.py -file path=usr/lib/python2.6/site-packages/xml2po/modes/__init__.py -file path=usr/lib/python2.6/site-packages/xml2po/modes/basic.py -file path=usr/lib/python2.6/site-packages/xml2po/modes/docbook.py -file path=usr/lib/python2.6/site-packages/xml2po/modes/gs.py -file path=usr/lib/python2.6/site-packages/xml2po/modes/mallard.py -file path=usr/lib/python2.6/site-packages/xml2po/modes/ubuntu.py -file path=usr/lib/python2.6/site-packages/xml2po/modes/xhtml.py +file path=usr/bin/gnome-doc-prepare +file path=usr/bin/gnome-doc-tool +file path=usr/bin/xml2po +file path=usr/lib/python2.7/vendor-packages/xml2po/__init__.py +file path=usr/lib/python2.7/vendor-packages/xml2po/modes/__init__.py +file path=usr/lib/python2.7/vendor-packages/xml2po/modes/basic.py +file path=usr/lib/python2.7/vendor-packages/xml2po/modes/docbook.py +file path=usr/lib/python2.7/vendor-packages/xml2po/modes/gs.py +file path=usr/lib/python2.7/vendor-packages/xml2po/modes/mallard.py +file path=usr/lib/python2.7/vendor-packages/xml2po/modes/ubuntu.py +file path=usr/lib/python2.7/vendor-packages/xml2po/modes/xhtml.py file path=usr/share/aclocal/gnome-doc-utils.m4 file path=usr/share/gnome-doc-utils/gnome-doc-utils.make file path=usr/share/gnome-doc-utils/icons/hicolor/48x48/status/admon-bug.png -- 2.11.4.GIT