tizen 2.3.1 release

diff --git a/packaging/Makefile b/packaging/Makefile
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/packaging/tizen-release.changes b/packaging/tizen-release.changes
deleted file mode 100644 (file)
index f525b35..0000000
--- a/packaging/tizen-release.changes
+++ /dev/null
@@ -1,11 +0,0 @@
-* Mon Jun 04 2012 Anas Nashif <anas.nashif@intel.com> 46e794f
-- Update release number
-
-* Wed May 30 2012 Ryan Ware <ryan.r.ware@intel.com> 831e857
-- Add default Smack manifest for tizen-release.spec
-
-* Mon May 21 2012 Kim Kibum <kb0929.kim@samsung.com> b4b8fc2
-- Upload Tizen:Base source
-[ Hyesook Choi ]
-- Initial empty repository
-

diff --git a/packaging/tizen-release.manifest b/packaging/tizen-release.manifest
deleted file mode 100644 (file)
index 017d22d..0000000
--- a/packaging/tizen-release.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
- <request>
-    <domain name="_"/>
- </request>
-</manifest>

diff --git a/packaging/tizen-release.spec b/packaging/tizen-release.spec
index 8e8322b..14f879f 100644 (file)
--- a/packaging/tizen-release.spec
+++ b/packaging/tizen-release.spec
@@ -1,18 +1,18 @@
-%define release_name Tizen
-%define dist_version 1.0.90
+%define release_name Magnolia
+%define dist_version 2.2.0
 
 Summary:       Tizen release files
 Name:          tizen-release
-Version:       1.0.90
-Release:       1
+Version:       2.2.0
+Release:       1.3
 License:       GPLv2
 Group:         System/Base
 URL:           http://www.tizen.com
 Provides:      system-release = %{version}-%{release}
 Provides:      tizen-release = %{version}-%{release}
+Provides:      os-release = %{version}-%{release}
 BuildArch:     noarch
 Source0:    RPM-GPG-KEY-tizen02
-Source1001: packaging/tizen-release.manifest 
 
 %description
 Tizen release files such as various /etc/ files that define the release.
@@ -20,7 +20,6 @@ Tizen release files such as various /etc/ files that define the release.
 %prep
 
 %build
-cp %{SOURCE1001} .
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -29,15 +28,11 @@ echo "Tizen release %{dist_version} (%{release_name})" > $RPM_BUILD_ROOT/etc/tiz
 
 ln -s tizen-release $RPM_BUILD_ROOT/etc/system-release
 
-cat > $RPM_BUILD_ROOT/etc/os-release <<EOF
-NAME=Tizen
-VERSION="%{dist_version} (%{release_name})"
-ID=tizen
-VERSION_ID=%{dist_version}
-PRETTY_NAME="Tizen %{dist_version} (%{release_name})"
-ANSI_COLOR="0;36"
-CPE_NAME="cpe:/o:tizen:tizen:%{dist_version}"
-EOF
+echo "NAME=\"Tizen\"" > $RPM_BUILD_ROOT/etc/os-release
+echo "VERSION=\"%{dist_version}, %{release_name}\"" >> $RPM_BUILD_ROOT/etc/os-release
+echo "ID=tizen" >> $RPM_BUILD_ROOT/etc/os-release
+echo "PRETTY_NAME=\"Tizen %{release_name} (%{dist_version})\"" >> $RPM_BUILD_ROOT/etc/os-release
+echo "VERSION_ID=\"%{dist_version}\"" >> $RPM_BUILD_ROOT/etc/os-release
 
 mkdir -p $RPM_BUILD_ROOT/etc/pki/rpm-gpg
 cp %{SOURCE0} $RPM_BUILD_ROOT/etc/pki/rpm-gpg
@@ -45,9 +40,11 @@ pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg
 ln -sf RPM-GPG-KEY-tizen02 RPM-GPG-KEY-tizen-2-primary
 popd
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %files
-%manifest tizen-release.manifest
 %config %attr(0644,root,root) /etc/tizen-release
-%config %attr(0644,root,root) /etc/os-release
 /etc/system-release
+/etc/os-release
 /etc/pki/rpm-gpg