From e90601feee6a00e05b3d425a8173c92b20d47787d49b5a7e7eebc2953efaadb9 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Wed, 6 Aug 2014 11:46:23 +0000 Subject: [PATCH 1/3] Accepting request 243700 from home:Andreas_Schwab:Factory - Build with RPM_OPT_FLAGS - Don't strip binaries OBS-URL: https://build.opensuse.org/request/show/243700 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=100 --- fcitx.changes | 6 ++++++ fcitx.spec | 11 +++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/fcitx.changes b/fcitx.changes index e7b48fb..83a8021 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 5 16:22:59 UTC 2014 - schwab@suse.de + +- Build with RPM_OPT_FLAGS +- Don't strip binaries + ------------------------------------------------------------------- Sat Jun 7 16:41:30 UTC 2014 - i@marguerite.su diff --git a/fcitx.spec b/fcitx.spec index 2bbfef4..4b522f9 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -397,6 +397,9 @@ cd build # fix dlopen-ed library name cmake .. \ + -DCMAKE_C_FLAGS="$RPM_OPT_FLAGS" \ + -DCMAKE_CXX_FLAGS="$RPM_OPT_FLAGS" \ + -DCMAKE_VERBOSE_MAKEFILE=On \ -DCMAKE_BUILD_TYPE=Release \ -DOPENCC_LIBRARY_FILENAME=libopencc.so.1 \ -DENCHANT_LIBRARY_FILENAME=libenchant.so.1 \ @@ -526,14 +529,6 @@ fdupes -n -q -r %{buildroot} %endif %endif -# strip unnessary libraries -%{__strip} %{buildroot}%{_libdir}/%{name}/*.so -%{__strip} %{buildroot}%{_libdir}/libfcitx*.so.* -%{__strip} %{buildroot}%{_libdir}/gtk-2.0/*/immodules/im-%{name}.so -%if 0%{?suse_version} >= 1140 || 0%{?fedora_version} -%{__strip} %{buildroot}%{_libdir}/gtk-3.0/*/immodules/im-%{name}.so -%endif - %post gtk2 %gtk2_immodule_post From bb0a31cd0baf9e31a13f4b0400328567a5dfce9ac4c12fece14b1210366c6632 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sat, 9 Aug 2014 05:31:53 +0000 Subject: [PATCH 2/3] Accepting request 243989 from home:fcrozat:branches:M17N - Fix default category for fcitx (ensure it doesn't go to Other on GNOME Classic) OBS-URL: https://build.opensuse.org/request/show/243989 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=101 --- fcitx.changes | 6 ++++++ fcitx.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/fcitx.changes b/fcitx.changes index 83a8021..7d87140 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 8 14:55:32 UTC 2014 - fcrozat@suse.com + +- Fix default category for fcitx (ensure it doesn't go to Other on + GNOME Classic) + ------------------------------------------------------------------- Tue Aug 5 16:22:59 UTC 2014 - schwab@suse.de diff --git a/fcitx.spec b/fcitx.spec index 4b522f9..56d87ed 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -455,7 +455,7 @@ sed -i "s/x-fskin/x-fskin;/" %{buildroot}%{_datadir}/applications/fcitx-skin-ins %if 0%{?suse_version} %suse_update_desktop_file fcitx Utility DesktopUtility %suse_update_desktop_file fcitx-skin-installer Utility DesktopUtility -%suse_update_desktop_file fcitx-configtool System X-SuSE-SystemSetup +%suse_update_desktop_file -r fcitx-configtool System X-SuSE-SystemSetup %endif %if 0%{?fedora_version} From 1b8dad39e7f778db06aaf87e22628dcde873c7d11c29738899a9ad850f2adff5 Mon Sep 17 00:00:00 2001 From: Marguerite Su Date: Sat, 9 Aug 2014 05:34:19 +0000 Subject: [PATCH 3/3] Accepting request 244027 from home:MargueriteSu:branches:M17N OBS-URL: https://build.opensuse.org/request/show/244027 OBS-URL: https://build.opensuse.org/package/show/M17N/fcitx?expand=0&rev=102 --- fcitx.changes | 5 +++++ fcitx.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/fcitx.changes b/fcitx.changes index 7d87140..47eb899 100644 --- a/fcitx.changes +++ b/fcitx.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Aug 9 05:33:21 UTC 2014 - i@marguerite.su + +- add baselibs.conf to SOURCE99 + ------------------------------------------------------------------- Fri Aug 8 14:55:32 UTC 2014 - fcrozat@suse.com diff --git a/fcitx.spec b/fcitx.spec index 56d87ed..9f2e5f7 100644 --- a/fcitx.spec +++ b/fcitx.spec @@ -34,6 +34,7 @@ Source7: xinput-fcitx Source8: openSUSE-themes.tar.gz Source9: macros.%{name} Source10: input.svgz +Source99: baselibs.conf BuildRequires: cairo-devel %if 0%{?suse_version} BuildRequires: dbus-1-devel