From 95f6392d5409ecb10adeb1e7595e0445a2028228 Mon Sep 17 00:00:00 2001
From: Igor Pashev <igor.pashev@nexenta.com>
Date: Fri, 21 Dec 2012 21:00:53 +0400
Subject: Rename expat packages

---
 expat/expat.p5m     | 16 ++++------------
 expat/expat1.p5m    | 11 -----------
 expat/libexpat.p5m  | 16 ++++++++++++++++
 expat/libexpat1.p5m | 11 +++++++++++
 expat/xmlwf.p5m     |  8 --------
 5 files changed, 31 insertions(+), 31 deletions(-)
 delete mode 100644 expat/expat1.p5m
 create mode 100644 expat/libexpat.p5m
 create mode 100644 expat/libexpat1.p5m
 delete mode 100644 expat/xmlwf.p5m

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/expat1.p5m b/expat/expat1.p5m
deleted file mode 100644
index d95b389..0000000
--- a/expat/expat1.p5m
+++ /dev/null
@@ -1,11 +0,0 @@
-set name=pkg.fmri value=pkg:/library/expat1@$(ips-version)
-set name=pkg.summary value="$(summary), shared library"
-set name=info.upstream-url value="$(home)"
-set name=info.source-url value="$(download)"
-
-license $(license-file) license="$(license)"
-
-file path=usr/lib/$(mach64)/libexpat.so.1.6.0
-link path=usr/lib/$(mach64)/libexpat.so.1 target=libexpat.so.1.6.0
-file path=usr/lib/libexpat.so.1.6.0
-link path=usr/lib/libexpat.so.1 target=libexpat.so.1.6.0
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/libexpat1.p5m b/expat/libexpat1.p5m
new file mode 100644
index 0000000..0bd439d
--- /dev/null
+++ b/expat/libexpat1.p5m
@@ -0,0 +1,11 @@
+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)"
+
+license $(license-file) license="$(license)"
+
+file path=usr/lib/$(mach64)/libexpat.so.1.6.0
+link path=usr/lib/$(mach64)/libexpat.so.1 target=libexpat.so.1.6.0
+file path=usr/lib/libexpat.so.1.6.0
+link path=usr/lib/libexpat.so.1 target=libexpat.so.1.6.0
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
-- 
cgit v1.2.3