Merge branch 'upstream' into tizen

diff --git a/bin/Makefile.am b/bin/Makefile.am
index d3de41b..9427873 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -13,6 +13,9 @@ AM_CPPFLAGS = \
                -I$(top_srcdir)/lib
 
 LDADD = $(top_builddir)/lib/libfribidi.la
+### TIZEN_ONLY(20170811): Apply ASLR to executable files.
+fribidi_LDFLAGS = -pie
+fribidi_CFLAGS = -fPIE
 
 $(top_builddir)/lib/libfribidi.la:
        cd $(top_builddir)/lib && $(MAKE) $(AM_MAKEFLAGS) libfribidi.la

diff --git a/packaging/baselibs.conf b/packaging/baselibs.conf
new file mode 100644 (file)
index 0000000..09f803b
--- /dev/null
+++ b/packaging/baselibs.conf
@@ -0,0 +1 @@
+fribidi

diff --git a/packaging/fribidi.changes b/packaging/fribidi.changes
new file mode 100644 (file)
index 0000000..75dc0fa
--- /dev/null
+++ b/packaging/fribidi.changes
@@ -0,0 +1,5 @@
+* Tue May 14 2013 Anas Nashif <anas.nashif@intel.com> upstream/0.19.5@88d68f0
+- update to 0.19.5
+- Set license using %license
+- Imported Upstream version 0.19.5
+

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

diff --git a/packaging/fribidi.spec b/packaging/fribidi.spec
new file mode 100644 (file)
index 0000000..d5a215c
--- /dev/null
+++ b/packaging/fribidi.spec
@@ -0,0 +1,71 @@
+Name:           fribidi
+Version:        1.0.5
+Release:        1
+Summary:        Free Implementation of BiDi Algorithm
+License:        LGPL-2.1
+Group:          System/Libraries
+Url:            http://fribidi.org/
+AutoReqProv:    on
+Provides:       locale(ar;he)
+Source:         fribidi-%{version}.tar.bz2
+Source2:        baselibs.conf
+Source1001:    fribidi.manifest
+BuildRequires:  pkg-config
+
+%description
+This library implements the algorithm as described in the "Unicode
+Standard Annex #9, the Bidirectional Algorithm,
+http://www.unicode.org/unicode/reports/tr9/". FriBidi is exhaustively
+tested against the Bidi Reference Code and, to the best of the
+developers' knowledge, does notcontain any conformance bugs.
+
+The API was inspired by the document "Bi-Di languages support - BiDi
+API proposal" by Franck Portaneri, which he wrote as a proposal for
+adding BiDi support to Mozilla.
+
+%package devel
+License:        LGPL-2.1
+Summary:        Development Files for FriBiDi
+Group:          Development/Libraries/C and C++
+Requires:       %{name} = %{version}
+Requires:       pkg-config
+
+%description devel
+This package provides headers and manual files for FriBiDi.
+
+%prep
+%setup -q
+cp %{SOURCE1001} .
+
+%build
+%reconfigure --disable-static \
+      --disable-docs
+%__make %{?_smp_mflags}
+
+%check
+%__make check
+
+%install
+%make_install
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%manifest %{name}.manifest
+%defattr(-,root,root)
+%{_bindir}/fribidi
+%{_libdir}/libfribidi.so.*
+%license COPYING
+%exclude %{_datadir}/man/*
+
+%files devel
+%manifest %{name}.manifest
+%defattr(-, root, root)
+%dir %{_includedir}/fribidi
+%{_includedir}/fribidi/*
+%{_libdir}/libfribidi.so
+%{_libdir}/pkgconfig/fribidi.pc
+
+%changelog