- Spec improvements:

move creating of compatibility links (5.2b10a2 -> 5.2) from spec
  file into Makefile

OBS-URL: https://build.opensuse.org/package/show/Publishing/docbook_5?expand=0&rev=30

Makefile

@@ -69,6 +69,7 @@ RNG_SCHEMAS    := $(addprefix $(RNG_PATH)/,$(RNG_SCHEMAS))
 #
 LINKS          := $(foreach v,$(DB_VERSIONS),$(NVDL_PATH)/$(v)/docbook.rng \
                     $(NVDL_PATH)/$(v)/docbook.sch)
+COMPAT_LINKS   := $(NVDL_PATH)/5.2  $(RNG_PATH)/5.2  $(SCH_PATH)/5.2
 ALL_DB_SCHEMAS :=  $(DTD_SCHEMAS) $(XSD_SCHEMAS) \
 		   $(RNG_SCHEMAS) $(SCH_SCHEMAS) $(NVDL_SCHEMAS) \
 		   $(LINKS)
@@ -85,6 +86,7 @@ install: $(DB_CATALOG)
 install: $(BINDIR)/db4-entities.pl
 install: $(XSLT_PATH)/db4-upgrade.xsl
 install: $(ALL_DB_SCHEMAS)
+install: $(COMPAT_LINKS)
 install: | $(INST_DIRECTORIES)
 	@echo "Ready."
 
@@ -102,8 +104,8 @@ $(RNG_PATH)/5.1/%: docbook-5.1/rng/% | $(DB_RNG_PATHS)
 	@echo "### Installing RNG 5.1 $<"
 	install -m644 $< $@
 	
-$(RNG_PATH)/5.2b10a2/%: docbook-$(LAST_VER)/rng/% | $(DB_RNG_PATHS)
-	@echo "### Installing RNG 5.2b10a2 $<"
+$(RNG_PATH)/$(LAST_VER)/%: docbook-$(LAST_VER)/rng/% | $(DB_RNG_PATHS)
+	@echo "### Installing RNG $(LAST_VER) $<"
 	install -m644 $< $@
 
 $(SCH_PATH)/5.0/%: docbook-5.0/sch/% | $(DB_SCH_PATHS)
@@ -113,8 +115,8 @@ $(SCH_PATH)/5.1/%: docbook-5.1/sch/% | $(DB_SCH_PATHS)
 	@echo "### Installing Schematron 5.1 $<"
 	install -m644 $< $@
 	
-$(SCH_PATH)/5.2b10a2/%: docbook-$(LAST_VER)/sch/%| $(DB_SCH_PATHS)
-	@echo "### Installing Schematron 5.2b10a2 $<"
+$(SCH_PATH)/$(LAST_VER)/%: docbook-$(LAST_VER)/sch/%| $(DB_SCH_PATHS)
+	@echo "### Installing Schematron $(LAST_VER) $<"
 	install -m644 $< $@	
 
 $(NVDL_PATH)/5.0/%: docbook-5.0/% | $(DB_NVDL_PATHS)
@@ -124,8 +126,8 @@ $(NVDL_PATH)/5.1/%: docbook-5.1/% | $(DB_NVDL_PATHS)
 	@echo "### Installing NVDL 5.1 $<"
 	install -m644 $< $@
 	
-$(NVDL_PATH)/5.2b10a2/%: docbook-$(LAST_VER)/% | $(DB_NVDL_PATHS)
-	@echo "### Installing NVDL 5.2b10a2 $<"
+$(NVDL_PATH)/$(LAST_VER)/%: docbook-$(LAST_VER)/% | $(DB_NVDL_PATHS)
+	@echo "### Installing NVDL $(LAST_VER) $<"
 	install -m644 $< $@	
 
 define NVDL_LINK_tmpl =
@@ -149,8 +151,19 @@ $(XSLT_PATH)/db4-upgrade.xsl: docbook-5.1/tools/db4-upgrade.xsl | $(XSLT_PATH)
 	@echo "### Installing upgrade stylesheet..."
 	install -m644 $< $@
 
+$(NVDL_PATH)/5.2: $(NVDL_PATH)/$(LAST_VER) | $(DB_NVDL_PATHS)
+	@echo "### Creating a link to $(NVDL_PATH)/5.2"
+	ln -sv --relative $< $@
 
+$(RNG_PATH)/5.2: $(RNG_PATH)/$(LAST_VER) | $(DB_RNG_PATHS)
+	@echo "### Creating a link to $(RNG_PATH)/5.2"
+	ln -sv --relative $< $@
 
+$(SCH_PATH)/5.2: $(SCH_PATH)/$(LAST_VER) | $(DB_SCH_PATHS)
+	@echo "### Creating a link to $(SCH_PATH)/5.2"
+	ln -sv --relative $< $@
+
+	
 # create needed directories
 #
 $(INST_DIRECTORIES):

docbook_5.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Aug 31 13:45:10 UTC 2020 - Thomas Schraitle <thomas.schraitle@suse.com> - 5.2b10a2
+
+- Spec improvements:
+  move creating of compatibility links (5.2b10a2 -> 5.2) from spec
+  file into Makefile
+
 -------------------------------------------------------------------
 Thu Aug  6 12:51:10 UTC 2020 - mmuschner <mmuschner@localhost>  - 5.2b10a2
 

docbook_5.spec

@@ -25,7 +25,7 @@ Release:        0
 Summary:        DocBook Schemas (DTD, RELAX NG, W3C Schema) for Version 5.x
 License:        SUSE-Oasis-Specification-Notice
 Group:          Productivity/Publishing/DocBook
-URL:            http://www.oasis-open.org/docbook/
+URL:            https://www.oasis-open.org/docbook/
 # XML Catalog Entry
 Source1:        %{name}.xml
 Source2:        %{name}-README.SUSE
@@ -41,7 +41,6 @@ Source510:      docbook-5.1.tar.bz2
 Source520:      docbook_5.2b10a2.tar.bz2
 # PATCH-FIX-OPENSUSE docbook_5-nvdl.patch change path to schema files
 Patch501:       %{name}-nvdl.patch
-
 #
 BuildRequires:  fdupes
 BuildRequires:  sgml-skel
@@ -105,15 +104,7 @@ find . -type f | xargs chmod a-x
 
 %install
 make DESTDIR=%{buildroot}
-pushd %{buildroot}%{xml_docbook_rng_dir}
-ln -s %{lastschemaversion} 5.2
-popd 
-pushd %{buildroot}%{xml_docbook_sch_dir}
-ln -s %{lastschemaversion} 5.2
-popd 
-pushd %{buildroot}%{xml_docbook_nvdl_dir}
-ln -s %{lastschemaversion} 5.2
-popd 
+
 # cleanup
 %fdupes %{buildroot}