rpms/system-config-rootpassword/devel system-config-rootpassword.spec, 1.17, 1.18
Lubomir Kundrak (lkundrak)
fedora-extras-commits at redhat.com
Tue Nov 20 11:33:19 UTC 2007
- Previous message: rpms/dvd+rw-tools/devel dvd+rw-tools-7.0-reload.patch, NONE, 1.1 dvd+rw-tools.spec, 1.31, 1.32
- Next message: rpms/xulrunner/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xulrunner.spec, 1.27, 1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: lkundrak
Update of /cvs/pkgs/rpms/system-config-rootpassword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv759
Modified Files:
system-config-rootpassword.spec
Log Message:
First part of the package cleanup -- fixing SPEC file issues (#226467) from the Merge review.
Index: system-config-rootpassword.spec
===================================================================
RCS file: /cvs/pkgs/rpms/system-config-rootpassword/devel/system-config-rootpassword.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- system-config-rootpassword.spec 18 Sep 2007 17:40:01 -0000 1.17
+++ system-config-rootpassword.spec 20 Nov 2007 11:32:45 -0000 1.18
@@ -1,80 +1,86 @@
-Summary: A graphical interface for modifying the rootpassword
-Name: system-config-rootpassword
-Version: 1.1.10
-Release: 4%{?dist}
-URL: http://fedora.redhat.com/
-License: GPL+
-ExclusiveOS: Linux
-Group: System Environment/Base
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildArch: noarch
-Source0: %{name}-%{version}.tar.bz2
-Obsoletes: redhat-config-rootpassword
-BuildRequires: desktop-file-utils
-BuildRequires: gettext
-BuildRequires: intltool
-Requires: pygtk2
-Requires: python2
-Requires: usermode >= 1.36
-Requires: libuser >= 0.49
-Requires: rhpl
-Prereq: gtk2 >= 2.6
+Name: system-config-rootpassword
+Version: 1.1.10
+Release: 5%{?dist}
+Summary: A graphical interface for modifying the rootpassword
+
+Group: System Environment/Base
+License: GPL+
+URL: http://fedora.redhat.com/
+# XXX: Hosted
+Source0: %{name}-%{version}.tar.bz2
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: gettext intltool
+BuildRequires: desktop-file-utils
+Requires: pygtk2 rhpl
+Requires: usermode >= 1.36
+Requires: libuser-python >= 0.49
+
+BuildArch: noarch
+Obsoletes: redhat-config-rootpassword
+Provides: redhat-config-rootpassword
%description
-system-config-rootpassword is a graphical user interface that allows
-the user to change the root password of the system.
+A graphical user interface that allows the user to change the root password
+of the system.
+
%prep
%setup -q
+
%build
-make
+make %{?_smp_mflags}
+
%install
+rm -rf $RPM_BUILD_ROOT
make INSTROOT=$RPM_BUILD_ROOT install
-desktop-file-install --vendor system --delete-original \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- --add-category Settings \
- --remove-category Application \
- $RPM_BUILD_ROOT%{_datadir}/applications/system-config-rootpassword.desktop
+desktop-file-install --vendor=fedora --delete-original \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --add-category Settings \
+ --remove-category Application \
+ $RPM_BUILD_ROOT%{_datadir}/applications/system-config-rootpassword.desktop
+
+%find_lang %{name}
-%find_lang %name
%clean
rm -rf $RPM_BUILD_ROOT
+
%post
touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
+
%postun
touch --no-create %{_datadir}/icons/hicolor
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
- gtk-update-icon-cache -q %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
+
%files -f %{name}.lang
-%defattr(-,root,root)
-#%doc COPYING
-#%doc doc/*
-/usr/bin/system-config-rootpassword
-%dir /usr/share/system-config-rootpassword
-%dir /usr/share/system-config-rootpassword/pixmaps
-/usr/share/system-config-rootpassword/*
-%dir /usr/share/firstboot/
-%dir /usr/share/firstboot/modules
-/usr/share/firstboot/modules/rootpassword.py*
-#%attr(0644,root,root) %{_mandir}/man8/system-config-rootpassword*
-#%attr(0644,root,root) %{_mandir}/ja/man8/system-config-rootpassword*
-%attr(0644,root,root) %{_datadir}/applications/system-config-rootpassword.desktop
+%defattr(-,root,root,-)
+%{_bindir}/system-config-rootpassword
+%dir %{_datadir}/system-config-rootpassword
+%dir %{_datadir}/system-config-rootpassword/pixmaps
+%{_datadir}/system-config-rootpassword/*
+%{_datadir}/firstboot/modules/rootpassword.py*
+%attr(0644,root,root) %{_datadir}/applications/fedora-system-config-rootpassword.desktop
%attr(0644,root,root) %{_datadir}/icons/hicolor/48x48/apps/system-config-rootpassword.png
-%attr(0644,root,root) %config /etc/security/console.apps/system-config-rootpassword
-%attr(0644,root,root) %config /etc/pam.d/system-config-rootpassword
+%attr(0644,root,root) %config %{_sysconfdir}/security/console.apps/system-config-rootpassword
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/pam.d/system-config-rootpassword
+
%changelog
+* Tue Nov 20 2007 Lubomir Kundrak <lkundrak at redhat.com - 1.1.10-5
+- Major SPEC file cleanup (#226467)
+
* Fri Sep 7 2007 Matthias Clasen <mclasen at redhat.com> - 1.1.10-4
- Fix menu categories
@@ -244,7 +250,7 @@
* Thu Jun 20 2002 Brent Fox <bfox at redhat.com> 0.9.0-2
- Move the debug parameter to launch
- Add snapsrc to Makefile
-
+
* Tue May 14 2002 Brent Fox <bfox at redhat.com> 0.2.0-3
- Added a debug mode
- Previous message: rpms/dvd+rw-tools/devel dvd+rw-tools-7.0-reload.patch, NONE, 1.1 dvd+rw-tools.spec, 1.31, 1.32
- Next message: rpms/xulrunner/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xulrunner.spec, 1.27, 1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list