tizen 2.3.1 release

diff --git a/packaging/diffutils-cmp-s-empty.patch b/packaging/diffutils-cmp-s-empty.patch
index 87925b7..bc1c6b4 100644 (file)
--- a/packaging/diffutils-cmp-s-empty.patch
+++ b/packaging/diffutils-cmp-s-empty.patch
@@ -1,6 +1,7 @@
---- diffutils/src/cmp.c.orig   2012-06-05 17:06:34.104942215 +0800
-+++ diffutils/src/cmp.c        2012-06-05 17:07:08.801945433 +0800
-@@ -324,12 +324,15 @@
+diff -up diffutils-2.8.1/src/cmp.c.cmp-s-empty diffutils-2.8.1/src/cmp.c
+--- diffutils-2.8.1/src/cmp.c.cmp-s-empty      2002-04-05 21:37:31.000000000 +0100
++++ diffutils-2.8.1/src/cmp.c  2010-06-25 14:56:08.464802321 +0100
+@@ -316,12 +316,15 @@ main (int argc, char **argv)
  
    /* If only a return code is needed,
       and if both input descriptors are associated with plain files,

diff --git a/packaging/diffutils.manifest b/packaging/diffutils.manifest
index 017d22d..75b0fa5 100644 (file)
--- a/packaging/diffutils.manifest
+++ b/packaging/diffutils.manifest
@@ -1,5 +1,5 @@
 <manifest>
- <request>
-    <domain name="_"/>
- </request>
+    <request>
+        <domain name="_"/>
+    </request>
 </manifest>

diff --git a/packaging/diffutils.spec b/packaging/diffutils.spec
old mode 100644 (file)
new mode 100755 (executable)
index 2b2d1cd..35888c1
--- a/packaging/diffutils.spec
+++ b/packaging/diffutils.spec
@@ -1,12 +1,12 @@
 Name:           diffutils
 Version:        3.0
-Release:        1
+Release:        3
 License:        GPLv2+
 Summary:        A GNU collection of diff utilities
 Url:            http://www.gnu.org/software/diffutils/diffutils.html
 Group:          Applications/Text
-Source:         %{name}-%{version}.tar.gz
-Source1001: packaging/diffutils.manifest 
+Source:         ftp://ftp.gnu.org/gnu/diffutils/diffutils-%{version}.tar.xz
+Source1001:     %{name}.manifest
 Patch0:         diffutils-cmp-s-empty.patch
 
 %description
@@ -24,25 +24,36 @@ Install diffutils if you need to compare text files.
 
 %prep
 %setup -q
-%patch0 -p1 
+%patch0 -p1
 
 %build
 cp %{SOURCE1001} .
 %configure --disable-nls
-make PR_PROGRAM=%{_bindir}/pr
+make %{?_smp_mflags} PR_PROGRAM=%{_bindir}/pr
 
 %install
 %make_install
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/license
+for keyword in LICENSE COPYING COPYRIGHT;
+do
+       for file in `find %{_builddir} -name $keyword`;
+       do
+               cat $file >> $RPM_BUILD_ROOT%{_datadir}/license/%{name};
+               echo "";
+       done;
+done
+
 %clean
 rm -rf %{buildroot}
 
-%docs_package 
+%docs_package
 
-%files 
-%manifest diffutils.manifest
+%files
 %defattr(-,root,root,-)
+%manifest %{name}.manifest
 %doc NEWS README COPYING
+%{_datadir}/license/%{name}
 %{_bindir}/*
 %{_mandir}/*/*
 %{_infodir}/diff.info*gz