rpms/wdm/devel wdm.spec,1.3,1.4

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/wdm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3940

Modified Files:
	wdm.spec 
Log Message:
* Mon Mar  3 2008 Patrice Dumas <pertusus at free.fr> 1.28-10
- all the images are now in desktop-backgrounds-basic



Index: wdm.spec
===================================================================
RCS file: /cvs/extras/rpms/wdm/devel/wdm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wdm.spec	19 Feb 2008 18:31:33 -0000	1.3
+++ wdm.spec	2 Mar 2008 23:23:51 -0000	1.4
@@ -4,7 +4,8 @@
 Summary:        WINGs Display Manager
 
 Group:          User Interface/X
-License:        GPL
+# many MIT source files from xdm, and GPLv2+ from Wings
+License:        GPLv2+
 URL:            http://voins.program.ru/wdm/
 Source0:        http://voins.program.ru/wdm/wdm-%{version}.tar.bz2
 # stolen from xdm
@@ -25,6 +26,8 @@
 # fix reconfiguration script
 Patch3:         wdm-1.28-reconf.patch
 
+#Patch4:         wdm-1.28-ck.patch
+
 BuildRequires:  WINGs-devel gettext libselinux-devel pam-devel
 BuildRequires:  libXt-devel libXmu-devel
 BuildRequires:  xrdb xterm /sbin/shutdown
@@ -35,7 +38,7 @@
 # we use 'include' in the pam file, so
 Requires:       pam >= 0.80
 # reuse the images
-Requires:       desktop-backgrounds-basic system-logos
+Requires:       desktop-backgrounds-basic
 
 %description
 wdm combines the functions of a graphical display manager identifying 
@@ -49,9 +52,10 @@
 Rothamel's "external greet" interface (see AUTHORS) was used to 
 communicate wdm with wdmLogin. 
 
-In fedora, wdm may be called through a wrapper, wdm-dynwm, which determines
-the available window managers using the freedesktop information and modifies
-the wdm-config configuration file accordingly, before launching wdm.
+In the distribution, wdm may be called through a wrapper, wdm-dynwm, 
+which determines the available window managers using the freedesktop 
+information and modifies the wdm-config configuration file accordingly, 
+before launching wdm.
 
 %prep
 %setup -q
@@ -59,11 +63,13 @@
 %patch1 -p1 -b .fedora
 %patch2 -p1 -b .failsafe_tmp
 %patch3 -p1 -b .reconf
+#%patch4 -p1 -b .ck
 
 %build
 
 export DEF_SERVER='%{_bindir}/X -nolisten tcp'
-export INSTALL='install -p'
+#export CFLAGS="$RPM_OPT_FLAGS `pkg-config --cflags ck-connector` -DUSE_CONSOLEKIT"
+#export LDFLAGS="`pkg-config --libs ck-connector`"
 
 %configure \
    --with-pamdir=%{_sysconfdir}/pam.d \
@@ -85,7 +91,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 install -p -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/update_wdm_wmlist
 
@@ -165,6 +171,9 @@
 
 
 %changelog
+* Mon Mar  3 2008 Patrice Dumas <pertusus at free.fr> 1.28-10
+- all the images are now in desktop-backgrounds-basic
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.28-9
 - Autorebuild for GCC 4.3