rpms/gdm/devel .cvsignore, 1.41, 1.42 gdm.spec, 1.223, 1.224 sources, 1.43, 1.44
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Feb 23 07:54:37 UTC 2007
Author: mclasen
Update of /cvs/dist/rpms/gdm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7115
Modified Files:
.cvsignore gdm.spec sources
Log Message:
small fixes
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore 23 Jan 2007 06:32:01 -0000 1.41
+++ .cvsignore 23 Feb 2007 07:54:35 -0000 1.42
@@ -1 +1 @@
-gdm-2.17.6.tar.bz2
+gdm-2.17.7.tar.bz2
Index: gdm.spec
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/gdm.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- gdm.spec 12 Feb 2007 16:57:03 -0000 1.223
+++ gdm.spec 23 Feb 2007 07:54:35 -0000 1.224
@@ -15,13 +15,13 @@
Summary: The GNOME Display Manager
Name: gdm
-Version: 2.17.6
-Release: 4%{?dist}
+Version: 2.17.7
+Release: 2%{?dist}
Epoch: 1
License: LGPL/GPL
Group: User Interface/X
URL: ftp://ftp.gnome.org/pub/GNOME/sources/gdm
-Source: gdm-%{PACKAGE_VERSION}.tar.bz2
+Source: http://ftp.gnome.org/pub/gnome/sources/gdm/2.17/gdm-%{version}.tar.bz2
Source1: gdm-pam
Source2: gdm-autologin-pam
Source3: gdmsetup-pam
@@ -51,12 +51,6 @@
Patch28: gdm-2.17.1-desensitize-entry.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=335786
-Patch30: gdm-2.17.6-username.patch
-
-# http://bugzilla.gnome.org/show_bug.cgi?id=400793
-Patch31: gdm-2.17.6-consolekit.patch
-
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Prereq: /usr/sbin/useradd
@@ -128,8 +122,6 @@
%patch24 -p1 -b .wtmp
%patch25 -p1 -b .indic-langs
%patch28 -p1 -b .desensitize-entry
-%patch30 -p1 -b .username
-%patch31 -p0 -b .consolekit
%build
cp -f %{SOURCE1} config/gdm
@@ -194,9 +186,18 @@
# FIXME: work around invalid categories for now
desktop-file-install --vendor gnome --delete-original \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --remove-category Application \
$RPM_BUILD_ROOT%{_datadir}/applications/gdmphotosetup.desktop || :
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/gdmflexiserver.destkop
+desktop-file-install --delete-original \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --remove-category Application \
+ $RPM_BUILD_ROOT%{_datadir}/applications/gdmflexiserver.desktop || :
+
+desktop-file-install --delete-original \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --remove-category Application \
+ $RPM_BUILD_ROOT%{_datadir}/applications/gdmflexiserver-xnest.desktop || :
# broken install-data-local in gui/Makefile.am makes this necessary
(cd $RPM_BUILD_ROOT%{_bindir} && ln -sf gdmXnestchooser gdmXnest)
@@ -307,7 +308,7 @@
%dir %{_sysconfdir}/gdm/PostLogin
%dir %{_sysconfdir}/gdm/modules
%{_datadir}/pixmaps
-%{_datadir}/icons
+%{_datadir}/icons/hicolor/*/apps/*.png
%{_datadir}/gdm
%{_datadir}/applications
%{_datadir}/gnome/help/gdm
@@ -322,6 +323,14 @@
%attr(1770, root, gdm) %dir %{_localstatedir}/gdm
%changelog
+* Fri Feb 23 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.17.7-2
+- Don't own /usr/share/icons/hicolor
+- Install all desktop files
+
+* Mon Feb 12 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.17.7-1
+- Update to 2.17.7
+- Drop upstreamed patches
+
* Mon Feb 12 2007 Matthias Clasen <mclasen at redhat.com> - 1:2.17.6-4
- Reuse existing sessions without asking
- Don't show failsafe sessions
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gdm/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources 23 Jan 2007 06:32:01 -0000 1.43
+++ sources 23 Feb 2007 07:54:35 -0000 1.44
@@ -1 +1 @@
-e9b91d43d90d512b7aa241b5a1755a88 gdm-2.17.6.tar.bz2
+c25dda025b6f8a8e473bae4db1ae94c6 gdm-2.17.7.tar.bz2
More information about the fedora-cvs-commits
mailing list