From 78fdea4d79dedd15c58f65534ebd0893b92d3460 Mon Sep 17 00:00:00 2001 From: pnemade Date: Nov 27 2007 09:12:59 +0000 Subject: Merge review SPEC cleanup rh#226461 --- diff --git a/system-config-language.spec b/system-config-language.spec index d29d9f2..3194a09 100644 --- a/system-config-language.spec +++ b/system-config-language.spec @@ -1,15 +1,14 @@ Summary: A graphical interface for modifying the system language Name: system-config-language Version: 1.2.14 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://fedoraproject.org/wiki/SystemConfig/language -License: GPL -ExclusiveOS: Linux +License: GPLv2+ Group: System Environment/Base -BuildRoot: %{_tmppath}/%{name}-%{version}-root +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch Source0: %{name}-%{version}.tar.bz2 -Obsoletes: redhat-config-language +Obsoletes: redhat-config-language <= %{version} BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: intltool @@ -18,8 +17,8 @@ Requires: python2 Requires: rhpl Requires: usermode >= 1.36 Requires: yum >= 2.9.5 -Prereq: gtk2 >= 2.6 -Obsoletes: locale_config +Requires: gtk2 >= 2.6 +Obsoletes: locale_config <= %{version} %description system-config-language is a graphical user interface that @@ -29,10 +28,16 @@ allows the user to change the default language of the system. %setup -q %build -make +make %{?_smp_mflags} %install +rm -rf $RPM_BUILD_ROOT make INSTROOT=$RPM_BUILD_ROOT install + +chmod 0644 $RPM_BUILD_ROOT%{_datadir}/system-config-language/*.py* +chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/system-config-language +chmod 0644 $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/system-config-language + desktop-file-install --vendor system --delete-original \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category System \ @@ -58,21 +63,24 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then fi %files -f %{name}.lang -%defattr(-,root,root) -#%doc COPYING +%defattr(-,root,root,-) +%doc COPYING #%doc doc/* -/usr/bin/system-config-language -%dir /usr/share/system-config-language -/usr/share/system-config-language/* -%dir /usr/share/firstboot/ -%dir /usr/share/firstboot/modules -/usr/share/firstboot/modules/language.py* -%attr(0644,root,root) %{_datadir}/applications/system-config-language.desktop -%attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-language.png -%attr(0644,root,root) %config /etc/security/console.apps/system-config-language -%attr(0644,root,root) %config /etc/pam.d/system-config-language +%{_bindir}/system-config-language +%dir %{_datadir}/system-config-language +%{_datadir}/system-config-language/* +%dir %{_datadir}/firstboot/ +%dir %{_datadir}/firstboot/modules +%{_datadir}/firstboot/modules/language.py* +%{_datadir}/applications/system-config-language.desktop +%{_datadir}/icons/hicolor/48x48/apps/system-config-language.png +%config(noreplace) %{_sysconfdir}/pam.d/system-config-language +%config(noreplace) %{_sysconfdir}/security/console.apps/system-config-language %changelog +* Tue Nov 27 2007 Parag Nemade - 1.2.14-2 +- Merge review SPEC cleanup rh#226461 + * Mon Nov 19 2007 Lingning Zhang - 1.2.14 - fix bug386731.