From 7b9e0b137685acef651e82e2c9ddbe128be19f3a Mon Sep 17 00:00:00 2001 From: Imran Zaman Date: Fri, 7 Mar 2014 14:06:05 +0200 Subject: [PATCH] tizen: fix build/release script and package group --- dists/rpm/libgsignon-glib-tizen.spec | 11 ++--------- tools/prepare-tizen.sh | 10 +++------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/dists/rpm/libgsignon-glib-tizen.spec b/dists/rpm/libgsignon-glib-tizen.spec index 1d48218..5645423 100644 --- a/dists/rpm/libgsignon-glib-tizen.spec +++ b/dists/rpm/libgsignon-glib-tizen.spec @@ -4,8 +4,8 @@ Name: libgsignon-glib Summary: GLib API for the SSO framework Version: 2.1.0 -Release: 1 -Group: System/Libraries +Release: 2 +Group: Security/Accounts License: LGPL-2.1 Source: %{name}-%{version}.tar.gz URL: https://01.org/gsso @@ -17,7 +17,6 @@ BuildRequires: pkgconfig(check) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) BuildRequires: pkgconfig(gio-2.0) -BuildRequires: gobject-introspection %description %{summary}. @@ -34,12 +33,6 @@ Requires: %{name} = %{version}-%{release} %prep %setup -q -n %{name}-%{version} -if [ -f = "gtk-doc.make" ] -then -rm gtk-doc.make -fi -touch gtk-doc.make -autoreconf -f -i %build diff --git a/tools/prepare-tizen.sh b/tools/prepare-tizen.sh index 1663298..f1fa04e 100755 --- a/tools/prepare-tizen.sh +++ b/tools/prepare-tizen.sh @@ -4,20 +4,16 @@ if [ $# -ne 2 -o -z "$1" -o -z "$2" ]; then echo "Invalid arguments supplied" - echo "Usage: ./prepare-tizen.sh libgsignon-glib-.tar.gz /absolute/path/to/destfolder" + echo "Usage: ./prepare-tizen.sh " echo "NOTE: All the files will be extracted under destfolder (instead of destfolder/libgsignon-glib-)" exit fi -currdir=`pwd`; -echo "CURR dir = $currdir" - mkdir -p $2 && \ cd $2 && \ -git rm -r *; rm -rf packaging; -tar -xzvf $currdir/$1 -C $2 --strip-components 1 && \ +git rm -f -r *; rm -rf packaging; +tar -xzvf $1 -C $2 --strip-components 1 && \ mkdir -p packaging && \ cp -f dists/rpm/libgsignon-glib-tizen.spec packaging/libgsignon-glib.spec && \ cp -f dists/rpm/libgsignon-glib-tizen.changes packaging/libgsignon-glib.changes && \ -cp $currdir/.gitignore $2/ && \ git add -f *; -- 2.34.1