swidtag: strongSwan swidtag file with double underscores

diff --git a/src/libimcv/plugins/imc_swid/Makefile.am b/src/libimcv/plugins/imc_swid/Makefile.am
index 6cb929eee969620423ae724aa429dfd206be9e3f..22f2e3762c5faab6110112a95eac7c2e1491df35 100644 (file)
--- a/src/libimcv/plugins/imc_swid/Makefile.am
+++ b/src/libimcv/plugins/imc_swid/Makefile.am
@@ -1,20 +1,20 @@
 regid = strongswan.org
 unique_sw_id = strongSwan-$(PACKAGE_VERSION_MAJOR)-$(PACKAGE_VERSION_MINOR)-$(PACKAGE_VERSION_BUILD)$(PACKAGE_VERSION_REVIEW)
-swid_tag = $(regid)_$(unique_sw_id).swidtag
+swid_tag = $(regid)__$(unique_sw_id).swidtag
 
 swiddir = $(pkgdatadir)/swidtag
 dist_swid_DATA = $(swid_tag)
-EXTRA_DIST = $(regid)_strongSwan.swidtag.in
-CLEANFILES = $(regid)_strongSwan*.swidtag
+EXTRA_DIST = $(regid)__strongSwan.swidtag.in
+CLEANFILES = $(regid)__strongSwan*.swidtag
 
-$(swid_tag) : $(regid)_strongSwan.swidtag.in
+$(swid_tag) : $(regid)__strongSwan.swidtag.in
        $(AM_V_GEN) \
        sed \
        -e "s:@VERSION_MAJOR@:$(PACKAGE_VERSION_MAJOR):" \
        -e "s:@VERSION_MINOR@:$(PACKAGE_VERSION_MINOR):" \
        -e "s:@VERSION_BUILD@:$(PACKAGE_VERSION_BUILD):" \
        -e "s:@VERSION_REVIEW@:$(PACKAGE_VERSION_REVIEW):" \
-       $(srcdir)/$(regid)_strongSwan.swidtag.in > $@
+       $(srcdir)/$(regid)__strongSwan.swidtag.in > $@
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \

diff --git a/src/libimcv/plugins/imc_swid/strongswan.org_strongSwan.swidtag.in b/src/libimcv/plugins/imc_swid/strongswan.org__strongSwan.swidtag.in
similarity index 99%
rename from src/libimcv/plugins/imc_swid/strongswan.org_strongSwan.swidtag.in
rename to src/libimcv/plugins/imc_swid/strongswan.org__strongSwan.swidtag.in
index 4935feab5a5cd58371c3333f20b32414ae530c64..0e5aa8d4d479e4b0e4eb7877b8f69e1bf9279388 100644 (file)
--- a/src/libimcv/plugins/imc_swid/strongswan.org_strongSwan.swidtag.in
+++ b/src/libimcv/plugins/imc_swid/strongswan.org__strongSwan.swidtag.in
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <SoftwareIdentity
   name="strongSwan"
   tagId="strongSwan-@VERSION_MAJOR@-@VERSION_MINOR@-@VERSION_BUILD@@VERSION_REVIEW@"

diff --git a/src/libimcv/plugins/imc_swima/Makefile.am b/src/libimcv/plugins/imc_swima/Makefile.am
index 9ba60a40df613b06bb3af01ea36e500af30b7dc7..67ea25e5846e5ccfad82d83473a93301173fb10d 100644 (file)
--- a/src/libimcv/plugins/imc_swima/Makefile.am
+++ b/src/libimcv/plugins/imc_swima/Makefile.am
@@ -1,20 +1,20 @@
 regid = strongswan.org
 unique_sw_id = strongSwan-$(PACKAGE_VERSION_MAJOR)-$(PACKAGE_VERSION_MINOR)-$(PACKAGE_VERSION_BUILD)$(PACKAGE_VERSION_REVIEW)
-swid_tag = $(regid)_$(unique_sw_id).swidtag
+swid_tag = $(regid)__$(unique_sw_id).swidtag
 
 swiddir = $(pkgdatadir)/swidtag
 dist_swid_DATA = $(swid_tag)
-EXTRA_DIST = $(regid)_strongSwan.swidtag.in
-CLEANFILES = $(regid)_strongSwan*.swidtag
+EXTRA_DIST = $(regid)__strongSwan.swidtag.in
+CLEANFILES = $(regid)__strongSwan*.swidtag
 
-$(swid_tag) : $(regid)_strongSwan.swidtag.in
+$(swid_tag) : $(regid)__strongSwan.swidtag.in
        $(AM_V_GEN) \
        sed \
        -e "s:@VERSION_MAJOR@:$(PACKAGE_VERSION_MAJOR):" \
        -e "s:@VERSION_MINOR@:$(PACKAGE_VERSION_MINOR):" \
        -e "s:@VERSION_BUILD@:$(PACKAGE_VERSION_BUILD):" \
        -e "s:@VERSION_REVIEW@:$(PACKAGE_VERSION_REVIEW):" \
-       $(srcdir)/$(regid)_strongSwan.swidtag.in > $@
+       $(srcdir)/$(regid)__strongSwan.swidtag.in > $@
 
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/libstrongswan \

diff --git a/src/libimcv/plugins/imc_swima/strongswan.org_strongSwan.swidtag.in b/src/libimcv/plugins/imc_swima/strongswan.org__strongSwan.swidtag.in
similarity index 99%
rename from src/libimcv/plugins/imc_swima/strongswan.org_strongSwan.swidtag.in
rename to src/libimcv/plugins/imc_swima/strongswan.org__strongSwan.swidtag.in
index 4935feab5a5cd58371c3333f20b32414ae530c64..0e5aa8d4d479e4b0e4eb7877b8f69e1bf9279388 100644 (file)
--- a/src/libimcv/plugins/imc_swima/strongswan.org_strongSwan.swidtag.in
+++ b/src/libimcv/plugins/imc_swima/strongswan.org__strongSwan.swidtag.in
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <SoftwareIdentity
   name="strongSwan"
   tagId="strongSwan-@VERSION_MAJOR@-@VERSION_MINOR@-@VERSION_BUILD@@VERSION_REVIEW@"