tizen 2.3 release

diff --git a/packaging/popt-pkgconfig-lib64.patch b/packaging/popt-pkgconfig-lib64.patch
new file mode 100644 (file)
index 0000000..dc09105
--- /dev/null
+++ b/packaging/popt-pkgconfig-lib64.patch
@@ -0,0 +1,24 @@
+diff -urNp popt-1.16.orig/Makefile.am popt-1.16/Makefile.am
+--- popt-1.16.orig/Makefile.am 2012-11-02 18:45:02.000000000 +0900
++++ popt-1.16/Makefile.am      2014-06-18 21:47:58.052719970 +0900
+@@ -47,7 +47,7 @@ usrlib_LTLIBRARIES = libpopt.la
+ libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
+ libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
+ 
+-pkgconfigdir = $(prefix)/lib/pkgconfig
++pkgconfigdir = $(prefix)/lib64/pkgconfig
+ pkgconfig_DATA = popt.pc
+ 
+ if HAVE_LD_VERSION_SCRIPT
+diff -urNp popt-1.16.orig/Makefile.in popt-1.16/Makefile.in
+--- popt-1.16.orig/Makefile.in 2012-11-02 18:45:02.000000000 +0900
++++ popt-1.16/Makefile.in      2014-06-18 21:48:29.420719373 +0900
+@@ -370,7 +370,7 @@ usrlib_LTLIBRARIES = libpopt.la
+ libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
+ libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@ \
+       $(am__append_1)
+-pkgconfigdir = $(prefix)/lib/pkgconfig
++pkgconfigdir = $(prefix)/lib64/pkgconfig
+ pkgconfig_DATA = popt.pc
+ man_MANS = popt.3
+ BUILT_SOURCES = popt.pc # popt.lcd

diff --git a/packaging/popt.spec b/packaging/popt.spec
index 1d24c60..48c94c4 100755 (executable)
--- a/packaging/popt.spec
+++ b/packaging/popt.spec
@@ -7,9 +7,11 @@ License:    MIT
 URL:        http://www.rpm5.org/
 Source0:    http://www.rpm5.org/files/%{name}/%{name}-%{version}.tar.gz
 Source1001: %{name}.manifest
+Patch1:     popt-pkgconfig-lib64.patch
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
+
 %description
 Popt is a C library for parsing command line parameters. Popt was
 heavily influenced by the getopt() and getopt_long() functions, but
@@ -36,6 +38,9 @@ API documentation of the popt library, too.
 
 %prep
 %setup -q -n %{name}-%{version}
+%ifarch x86_64
+%patch1 -p1
+%endif
 
 %build
 cp %{SOURCE1001} .