merge with master

diff --git a/packaging/libhangul.spec b/packaging/libhangul.spec
index ee444cf..28082de 100644 (file)
--- a/packaging/libhangul.spec
+++ b/packaging/libhangul.spec
@@ -1,74 +1,71 @@
-Name:       libhangul
-Summary:    Hangul keyboard input library
-Version:    0.0.10
-Release:    1
-Group:      System Environment/Libraries
-License:    LGPL
-Source0:    %{name}-%{version}.tar.bz2
-Requires(post):  /sbin/ldconfig
-Requires(postun):  /sbin/ldconfig
-
-BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+Name:           libhangul
+Version:        0.1.0
+Release:        1
+License:        LGPLv2.1
+Group:          System/I18n/Korean
+AutoReqProv:    on
+Url:            http://code.google.com/p/libhangul
+Source0:        %{name}-%{version}.tar.gz
+Summary:        Hangul input library used by scim-hangul and ibus-hangul
+BuildRequires:  gettext-tools
+
 
 %description
-This library implements Hangul keyboard input with various types of Korean keyboards.  It is intended to be a base library of Korean input methods on multiple platforms.
-This package contains the shared library and the runtime data.
+Hangul input library used by scim-hangul and ibus-hangul
+
 
-%package data
-Summary:    Hangul keyboard input library - data
-Group:      System Environment/Libraries
-Requires:   %{name} = %{version}-%{release}
+Authors:
+--------
+    Choe Hwanjin <choe.hwanjin@gmail.com>
+    Joon-cheol Park <jooncheol@gmail.com>
 
-%description data
-This package contains the architecture independent data.
+Hangul input library used by scim-hangul and ibus-hangul
 
 
 %package devel
-Summary:    Hangul keyboard input library - development files
-Group:      Development/Libraries
-Requires:   %{name} = %{version}-%{release}
+Summary:        Include Files and Libraries mandatory for Development
+Group:          System/I18n/Korean
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
-This package contains the header files and the static library.
+This package contains all necessary include files and libraries needed
+to develop applications that require these.
 
 
 %prep
-%setup -q -n %{name}-%{version}
-
+%setup -q
 
 %build
-%reconfigure --disable-static
-
-# Call make instruction with smp support
-make %{?jobs:-j%jobs}
-
+%autogen
+%configure --disable-static --with-pic
+%{__make} %{?jobs:-j%jobs}
 
 %install
-rm -rf %{buildroot}
-%make_install
-
+make DESTDIR=${RPM_BUILD_ROOT} install
+%{__rm} -f %{buildroot}%{_libdir}/*.la
 
 %clean
 rm -rf %{buildroot}
 
+%post
+/sbin/ldconfig
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
+%postun
+/sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
-%{_libdir}/lib*.so*
-
-
-%files data
-%defattr(-,root,root,-)
-%{_datadir}/libhangul/*
-
+%defattr(-, root, root)
+%doc AUTHORS COPYING NEWS README ChangeLog
+%{_libdir}/lib*.so.*
+%dir %{_datadir}/libhangul/
+%dir %{_datadir}/libhangul/hanja/
+%{_datadir}/libhangul/hanja/hanja.txt
+%{_bindir}/hangul
+%{_datadir}/locale/ko/LC_MESSAGES/libhangul.mo
 
 %files devel
-%defattr(-,root,root,-)
-%{_includedir}/hangul-1.0/*.h
-%{_libdir}/pkgconfig/*.pc
-
+%defattr(-, root, root)
+%dir /usr/include/hangul-1.0/
+/usr/include/hangul-1.0/*
+%{_libdir}/lib*.so
+%{_libdir}/pkgconfig/libhangul.pc