liangsuilong pushed to fcitx (f22). "Minor spec syntax cleanup"

[notifications at fedoraproject.org]

>From ee53915d214d20205ab7bfc99917b5375f836403 Mon Sep 17 00:00:00 2001
From: Christopher Meng <i at cicku.me>
Date: Thu, 5 Mar 2015 23:05:56 -0500
Subject: Minor spec syntax cleanup


diff --git a/fcitx.spec b/fcitx.spec
index e04a643..e501b75 100644
--- a/fcitx.spec
+++ b/fcitx.spec
@@ -59,8 +59,7 @@ The %{name}-libs package provides shared libraries for Fcitx
 Summary:		Development files for Fcitx
 Group:			Development/Libraries
 Requires:		%{name}-libs%{?_isa} = %{version}-%{release}
-Requires:		/usr/bin/pkg-config
-Requires:		libX11-devel
+Requires:		libX11-devel%{?_isa}
 
 %description devel
 The %{name}-devel package contains libraries and header files necessary for
@@ -148,38 +147,32 @@ pushd build
 make VERBOSE=1 %{?_smp_mflags}
 
 %install
-pushd build
-make install INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT
-rm -f %{buildroot}%{_libdir}/*.la
-popd
+%make_install INSTALL="install -p" -C build
 
-install -pm 644 -D %{SOURCE1} %{buildroot}%{_xinputconf}
+find %{buildroot}%{_libdir} -name '*.a' -delete -print
 
-install -pm 644 AUTHORS ChangeLog THANKS TODO COPYING %{buildroot}/%{_docdir}/%{name}/
+install -pm 644 -D %{SOURCE1} %{buildroot}%{_xinputconf}
 
 # patch fcitx4-config to use pkg-config to solve libdir to avoid multiarch
 # confilict
 sed -i -e 's:%{_libdir}:`pkg-config --variable=libdir fcitx`:g' \
-  ${RPM_BUILD_ROOT}%{_bindir}/fcitx4-config
+  %{buildroot}%{_bindir}/fcitx4-config
 
-chmod +x ${RPM_BUILD_ROOT}%{_datadir}/%{name}/data/env_setup.sh
+chmod +x %{buildroot}%{_datadir}/%{name}/data/env_setup.sh
 
 %find_lang %{name}
 
 desktop-file-install --delete-original \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}-skin-installer.desktop
+  --dir %{buildroot}%{_datadir}/applications \
+  %{buildroot}%{_datadir}/applications/%{name}-skin-installer.desktop
 
 desktop-file-install --delete-original \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}-configtool.desktop
+  --dir %{buildroot}%{_datadir}/applications \
+  %{buildroot}%{_datadir}/applications/%{name}-configtool.desktop
 
 desktop-file-install --delete-original \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-
-%clean
-rm -rf %{buildroot}
+  --dir %{buildroot}%{_datadir}/applications \
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %post 
 %{_sbindir}/alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_xinputconf} 55 || :
@@ -227,7 +220,8 @@ fi
 %{_bindir}/gtk-query-immodules-3.0-%{__isa_bits} --update-cache || :
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog THANKS TODO
+%license COPYING
 %config %{_xinputconf}
 %{_bindir}/fcitx-*
 %{_bindir}/fcitx
@@ -256,8 +250,7 @@ fi
 %{_mandir}/man1/txt2mb.1.gz
 
 %files libs
-%defattr(-,root,root,-)
-%doc
+%license COPYING
 %{_libdir}/libfcitx*.so.*
 %dir %{_libdir}/%{name}/
 %{_libdir}/%{name}/%{name}-[!pqt]*.so
@@ -269,8 +262,7 @@ fi
 %{_libdir}/girepository-1.0/Fcitx-1.0.typelib
 
 %files data
-%defattr(-,root,root,-)
-%doc 
+%license COPYING
 %{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 %{_datadir}/icons/hicolor/22x22/apps/%{name}.png
 %{_datadir}/icons/hicolor/24x24/apps/%{name}.png
@@ -300,8 +292,8 @@ fi
 %{_datadir}/dbus-1/services/org.fcitx.Fcitx.service
 
 %files devel
-%defattr(-,root,root,-)
-%doc 
+%doc AUTHORS ChangeLog THANKS TODO
+%license COPYING
 %{_bindir}/fcitx4-config
 %{_libdir}/libfcitx*.so
 %{_libdir}/pkgconfig/fcitx*.pc
@@ -311,13 +303,11 @@ fi
 %{_datadir}/gir-1.0/Fcitx-1.0.gir
 
 %files table-chinese
-%defattr(-,root,root,-)
 %doc
 %{_datadir}/%{name}/table/*
 %{_datadir}/%{name}/imicon/[!ps]*.png
 
 %files pinyin
-%defattr(-,root,root,-)
 %doc
 %{_datadir}/%{name}/inputmethod/pinyin.conf
 %{_datadir}/%{name}/inputmethod/shuangpin.conf
@@ -333,32 +323,26 @@ fi
 %{_datadir}/%{name}/py-enhance/
 
 %files qw
-%defattr(-,root,root,-)
 %doc
 %{_datadir}/%{name}/inputmethod/qw.conf
 %{_libdir}/%{name}/%{name}-qw.so
 %{_datadir}/%{name}/addon/fcitx-qw.conf
 
 %files table
-%defattr(-,root,root,-)
 %doc
 %{_datadir}/%{name}/configdesc/table.desc
 %{_libdir}/%{name}/%{name}-table.so
 %{_datadir}/%{name}/addon/fcitx-table.conf
 
 %files gtk2
-%defattr(-,root,root,-)
 %{_libdir}/gtk-2.0/%{gtk2_binary_version}/immodules/im-fcitx.so
 
 %files gtk3
-%defattr(-,root,root,-)
 %{_libdir}/gtk-3.0/%{gtk3_binary_version}/immodules/im-fcitx.so
 
 %files qt4
-%defattr(-,root,root,-)
 %{_libdir}/qt4/plugins/inputmethods/qtim-fcitx.so
 
-
 %changelog
 * Mon Jan 26 2015 David Tardon <dtardon at redhat.com> - 4.2.8.4-7
 - rebuild for ICU 54.1
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/fcitx.git/commit/?h=f22&id=ee53915d214d20205ab7bfc99917b5375f836403