summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Pashev <igor.pashev@nexenta.com>2012-12-21 21:00:53 +0400
committerIgor Pashev <igor.pashev@nexenta.com>2012-12-21 21:00:53 +0400
commit95f6392d5409ecb10adeb1e7595e0445a2028228 (patch)
treed173d092f9232a50e8612836201dd958d3a877cc
parentb7ae173c0e27ab9517bd36ab6342ae5e327a9747 (diff)
downloadcibs-pkgs-95f6392d5409ecb10adeb1e7595e0445a2028228.tar.gz
Rename expat packages
-rw-r--r--expat/expat.p5m16
-rw-r--r--expat/libexpat.p5m16
-rw-r--r--expat/libexpat1.p5m (renamed from expat/expat1.p5m)2
-rw-r--r--expat/xmlwf.p5m8
4 files changed, 21 insertions, 21 deletions
diff --git a/expat/expat.p5m b/expat/expat.p5m
index b9a5132..b497b28 100644
--- a/expat/expat.p5m
+++ b/expat/expat.p5m
@@ -1,16 +1,8 @@
-set name=pkg.fmri value=pkg:/library/expat@$(ips-version)
-set name=pkg.summary value="$(summary)"
+set name=pkg.fmri value=pkg:/text/expat@$(ips-version)
+set name=pkg.summary value="Determines if an XML document is well-formed"
set name=info.upstream-url value="$(home)"
set name=info.source-url value="$(download)"
license $(license-file) license="$(license)"
-
-depend fmri=pkg:/library/expat1@$(ips-version) type=require
-depend fmri=pkg:/library/expat1@$(ips-version) type=incorporate
-
-file path=usr/include/expat.h
-file path=usr/include/expat_config.h
-file path=usr/include/expat_external.h
-file path=usr/lib/pkgconfig/expat.pc
-link path=usr/lib/$(mach64)/libexpat.so target=libexpat.so.1
-link path=usr/lib/libexpat.so target=libexpat.so.1
+file path=usr/share/man/man1/xmlwf.1
+file path=usr/bin/xmlwf
diff --git a/expat/libexpat.p5m b/expat/libexpat.p5m
new file mode 100644
index 0000000..fe762ad
--- /dev/null
+++ b/expat/libexpat.p5m
@@ -0,0 +1,16 @@
+set name=pkg.fmri value=pkg:/library/libexpat@$(ips-version)
+set name=pkg.summary value="$(summary)"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+depend fmri=pkg:/library/libexpat1@$(ips-version) type=require
+depend fmri=pkg:/library/libexpat1@$(ips-version) type=incorporate
+
+file path=usr/include/expat.h
+file path=usr/include/expat_config.h
+file path=usr/include/expat_external.h
+file path=usr/lib/pkgconfig/expat.pc
+link path=usr/lib/$(mach64)/libexpat.so target=libexpat.so.1
+link path=usr/lib/libexpat.so target=libexpat.so.1
diff --git a/expat/expat1.p5m b/expat/libexpat1.p5m
index d95b389..0bd439d 100644
--- a/expat/expat1.p5m
+++ b/expat/libexpat1.p5m
@@ -1,4 +1,4 @@
-set name=pkg.fmri value=pkg:/library/expat1@$(ips-version)
+set name=pkg.fmri value=pkg:/library/libexpat1@$(ips-version)
set name=pkg.summary value="$(summary), shared library"
set name=info.upstream-url value="$(home)"
set name=info.source-url value="$(download)"
diff --git a/expat/xmlwf.p5m b/expat/xmlwf.p5m
deleted file mode 100644
index e7e9541..0000000
--- a/expat/xmlwf.p5m
+++ /dev/null
@@ -1,8 +0,0 @@
-set name=pkg.fmri value=pkg:/text/xmlwf@$(ips-version)
-set name=pkg.summary value="Determines if an XML document is well-formed"
-set name=info.upstream-url value="$(home)"
-set name=info.source-url value="$(download)"
-
-license $(license-file) license="$(license)"
-file path=usr/share/man/man1/xmlwf.1
-file path=usr/bin/xmlwf