diff options
| author | Miroslav Safr <miroslav.safr@tieto.com> | 2010-07-22 17:28:55 +0300 |
|---|---|---|
| committer | Miroslav Safr <miroslav.safr@tieto.com> | 2010-07-23 17:06:28 +0300 |
| commit | 5cee7f9a179b841f6023e96a2e96fd4e3d0f6f3a (patch) | |
| tree | 406df42331e3210895b7295b7b2f34a940124915 | |
| parent | 111d0f1808eb057c5161c4de3e18519eae4d3a91 (diff) | |
Changes: rpm building for Meego
RevBy:
Details: 1. reset execute flag for mrichtextedit.h and mrichtexteditstyle.h
2. spec file: version number
3. spec file: mesa-libEGL-devel dependency because of arm packages confilct
4. added prf files and mmoc.pl
5. added imtoolbars
6. libmeegotouch-tests package added to Group: Development/Libraries
| -rw-r--r-- | libmeegotouch.spec | 14 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/include/mrichtextedit.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/include/mrichtexteditstyle.h | 0 | ||||
| -rw-r--r--[-rwxr-xr-x] | src/views/style/mrichtexteditstyle.h | 0 |
4 files changed, 8 insertions, 6 deletions
diff --git a/libmeegotouch.spec b/libmeegotouch.spec index 978f2026..41f62e33 100644 --- a/libmeegotouch.spec +++ b/libmeegotouch.spec @@ -5,7 +5,7 @@ # Name: libmeegotouch -Version: 0.20.2 +Version: 0.20.28 Release: 1%{?dist} Summary: Meego Touch Framework @@ -40,7 +40,8 @@ BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(gconf-2.0) BuildRequires: pkgconfig(contextprovider-1.0) BuildRequires: pkgconfig(gl) -BuildRequires: mesa-libEGL-devel +#EGL packages conflict on arm builds +#BuildRequires: mesa-libEGL-devel BuildRequires: qt-devel BuildRequires: doxygen BuildRequires: icu @@ -211,6 +212,7 @@ Demo application for the Meego Touch application extensions %package -n libmeegotouch-tests Summary: Meego Touch unit tests +Group: Development/Libraries %description -n libmeegotouch-tests Unit testing binaries and shell scripts for testing the libmeegotouch library @@ -540,14 +542,14 @@ fi %{_libdir}/libmeegotouch*.so %{_libdir}/libmeegotouch*.prl %{_libdir}/pkgconfig/* -%{qt_install_data_dir}/mkspecs/features/meegotouch.prf -%{qt_install_data_dir}/mkspecs/features/meegotouch_defines.prf -%{qt_install_data_dir}/mkspecs/features/meegotouch_translations.prf - +%{qt_install_data_dir}/mkspecs/features/*.prf +%dir /usr/share/meegotouch/imtoolbars +/usr/share/meegotouch/imtoolbars/* %files -n meegotouch-devel-tools %defattr(-,root,root) /usr/bin/mmoc +/usr/bin/mmoc.pl /usr/bin/mgen /usr/bin/m-servicefwgen /usr/bin/mapplettester diff --git a/src/include/mrichtextedit.h b/src/include/mrichtextedit.h index 45fd8384..45fd8384 100755..100644 --- a/src/include/mrichtextedit.h +++ b/src/include/mrichtextedit.h diff --git a/src/include/mrichtexteditstyle.h b/src/include/mrichtexteditstyle.h index 7b84d455..7b84d455 100755..100644 --- a/src/include/mrichtexteditstyle.h +++ b/src/include/mrichtexteditstyle.h diff --git a/src/views/style/mrichtexteditstyle.h b/src/views/style/mrichtexteditstyle.h index 5da00ec4..5da00ec4 100755..100644 --- a/src/views/style/mrichtexteditstyle.h +++ b/src/views/style/mrichtexteditstyle.h |