From: ronan <ronan@ronan-pc.(none)>
Date: Thu, 2 May 2013 11:01:35 +0000 (+0200)
Subject: - solve tizen-coreutils for opensuse 12.2 (remove man).
X-Git-Tag: rev_0.4~341^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47477275d77a3ff2b5ae937adee6ed5ea175abd4;p=scm%2Fbb%2Ftizen.git

- solve tizen-coreutils for opensuse 12.2 (remove man).
---

diff --git a/README b/README
index 264489f..446115d 100644
--- a/README
+++ b/README
@@ -13,10 +13,10 @@ for fedora:
    - makeinfo is provide by texinfo.
 
 # for opensuse 12.2
-# zypper in make gcc gcc-c++ patch diffstat makeinfo chrpath python-ncurses python-pysqlite wget sudo glibc-locale
+# zypper in make gcc gcc-c++ patch diffstat makeinfo chrpath python-curses python-pysqlite wget sudo glibc-locale
 
 # for opensuse 12.3
-# zypper in make gcc gcc-c++ patch diffstat makeinfo chrpath python-ncurses python-pysqlite wget sudo glibc-locale
+# zypper in make gcc gcc-c++ patch diffstat makeinfo chrpath python-curses python-pysqlite wget sudo glibc-locale
 
 2) install unp 
 ### for opensuse 
diff --git a/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils-extraconf.inc b/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils-extraconf.inc
index e69de29..5ea5989 100644
--- a/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils-extraconf.inc
+++ b/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils-extraconf.inc
@@ -0,0 +1,11 @@
+SRC_URI += "file://man.Makefile.am.patch \
+            file://tizen-coreutils.spec.patch \
+           "
+
+do_patch_append () {
+ echo RLM begining of do_patch
+ cat ${WORKDIR}/man.Makefile.am.patch | patch -s -p1 --fuzz=2
+ cat ${WORKDIR}/tizen-coreutils.spec.patch | patch -s -p1 --fuzz=2
+
+ echo RLM end of do_patch
+}
diff --git a/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils/man.Makefile.am.patch b/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils/man.Makefile.am.patch
new file mode 100644
index 0000000..109c2bd
--- /dev/null
+++ b/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils/man.Makefile.am.patch
@@ -0,0 +1,45 @@
+diff --git a/man/Makefile.am b/man/Makefile.am
+index 32df9d1..a89f4c7 100644
+--- a/man/Makefile.am
++++ b/man/Makefile.am
+@@ -164,13 +164,7 @@ mapped_name = `echo $*|sed 's/install/ginstall/; s/test/[/'`
+ 	         rm -rf $t;					\
+ 	         mkdir $t;					\
+ 	         (cd $t && $(LN_S) ../../src/$(mapped_name) $*); \
+-	            $(PERL) -- $(srcdir)/help2man		\
+-	             --source='$(PACKAGE_STRING)'		\
+-	             --include=$(srcdir)/$*.x			\
+-	             --output=$t/$@ $t/$*;			\
+ 	       }						\
+-	    && sed 's|$*\.td/||g' $t/$@ > $@			\
+-	    && chmod a-w $@					\
+ 	    && rm -rf $t ;;					\
+ 	esac
+ 
+diff --git a/man/Makefile.in b/man/Makefile.in
+index f75b88b..65a01df 100644
+--- a/man/Makefile.in
++++ b/man/Makefile.in
+@@ -589,7 +589,7 @@ install-man1: $(man1_MANS) $(man_MANS)
+ 	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
+ 	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+ 	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
++	  #$(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
+ 	done
+ uninstall-man1:
+ 	@$(NORMAL_UNINSTALL)
+@@ -862,13 +862,7 @@ yes.1:		$(common_dep)	$(srcdir)/yes.x		../src/yes.c
+ 	         rm -rf $t;					\
+ 	         mkdir $t;					\
+ 	         (cd $t && $(LN_S) ../../src/$(mapped_name) $*); \
+-	            $(PERL) -- $(srcdir)/help2man		\
+-	             --source='$(PACKAGE_STRING)'		\
+-	             --include=$(srcdir)/$*.x			\
+-	             --output=$t/$@ $t/$*;			\
+ 	       }						\
+-	    && sed 's|$*\.td/||g' $t/$@ > $@			\
+-	    && chmod a-w $@					\
+ 	    && rm -rf $t ;;					\
+ 	esac
+ 
diff --git a/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils/tizen-coreutils.spec.patch b/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils/tizen-coreutils.spec.patch
new file mode 100644
index 0000000..4e5f5d2
--- /dev/null
+++ b/meta-tizen-ivi/recipes-tizen/tizen-coreutils/tizen-coreutils/tizen-coreutils.spec.patch
@@ -0,0 +1,13 @@
+diff --git a/packaging/tizen-coreutils.spec b/packaging/tizen-coreutils.spec
+index 7b60ead..9715037 100644
+--- a/packaging/tizen-coreutils.spec
++++ b/packaging/tizen-coreutils.spec
+@@ -64,7 +64,7 @@ mv %{buildroot}{%{_bindir},%{_sbindir}}/chroot
+ 
+ # These come from util-linux and/or procps.
+ for i in hostname uptime kill ; do
+-    rm %{buildroot}{%{_bindir}/$i,%{_mandir}/man1/$i.1}
++    rm -f %{buildroot}{%{_bindir}/$i,%{_mandir}/man1/$i.1}
+ done
+ 
+ # Use hard links instead of symbolic links for LC_TIME files (bug #246729).