rpms/slim/devel slim-1.3.0-make.patch,NONE,1.1 slim.spec,1.2,1.3

[Anders F Björklund (afb)]

Author: afb

Update of /cvs/pkgs/rpms/slim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26884

Modified Files:
	slim.spec 
Added Files:
	slim-1.3.0-make.patch 
Log Message:
new version, with pam

slim-1.3.0-make.patch:

--- NEW FILE slim-1.3.0-make.patch ---
--- slim-1.3.0/Makefile.orig	2007-07-15 16:09:28.000000000 +0200
+++ slim-1.3.0/Makefile	2007-08-06 19:01:49.000000000 +0200
@@ -5,7 +5,9 @@
 #######################################################
 CXX=/usr/bin/g++
 CC=/usr/bin/gcc
-CFLAGS=-Wall -I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
+INSTALL=install
+OPTFLAGS=-O2 -g -Wall
+CFLAGS=$(OPTFLAGS) -I. -I/usr/X11R6/include -I/usr/include/freetype2 -I/usr/include/freetype2/config -I/usr/include/libpng12 -I/usr/include
 CXXFLAGS=$(CFLAGS)
 LDFLAGS=-L/usr/X11R6/lib -lXft -lX11 -lfreetype -lXrender -lfontconfig -lpng12 -lz -lm -lcrypt -lXmu -lpng -ljpeg
 CUSTOM=-DHAVE_SHADOW
@@ -42,10 +44,10 @@ slim: $(OBJECTS)
 	$(CC) $(CFLAGS) $(DEFINES) $(CUSTOM) -c $< -o $@
 
 install: slim install-theme
-	install -D -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim
-	install -D -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1/slim.1
+	$(INSTALL) -D -m 755 slim $(DESTDIR)$(PREFIX)/bin/slim
+	$(INSTALL) -D -m 644 slim.1 $(DESTDIR)$(MANDIR)/man1/slim.1
 	test -e $(DESTDIR)$(CFGDIR)/slim.conf || \
-		install -D -m 644 slim.conf $(DESTDIR)$(CFGDIR)/slim.conf
+		$(INSTALL) -D -m 644 slim.conf $(DESTDIR)$(CFGDIR)/slim.conf
 
 clean:
 	@rm -f slim *.o
@@ -61,9 +63,9 @@ dist:
 
 
 install-theme:
-	install -D -m 644 themes/default/slim.theme \
+	$(INSTALL) -D -m 644 themes/default/slim.theme \
 		 $(DESTDIR)$(PREFIX)/share/slim/themes/default/slim.theme
-	install -D -m 644 themes/default/panel.png \
+	$(INSTALL) -D -m 644 themes/default/panel.png \
 		 $(DESTDIR)$(PREFIX)/share/slim/themes/default/panel.png
-	install -D -m 644 themes/default/background.jpg \
+	$(INSTALL) -D -m 644 themes/default/background.jpg \
 		 $(DESTDIR)$(PREFIX)/share/slim/themes/default/background.jpg


Index: slim.spec
===================================================================
RCS file: /cvs/pkgs/rpms/slim/devel/slim.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- slim.spec	6 Aug 2007 16:45:41 -0000	1.2
+++ slim.spec	3 Sep 2007 19:44:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           slim
-Version:        1.2.6
-Release:        6%{?dist}
+Version:        1.3.0
+Release:        1%{?dist}
 Summary:        Simple Login Manager
 
 Group:          User Interface/X
@@ -14,7 +14,7 @@
 Source3:        slim-fedora.txt
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Patch0:         slim-1.2.6-make.patch
+Patch0:         slim-1.3.0-make.patch
 Patch1:         slim-1.2.6-usexwd.patch
 Patch2:         slim-1.2.6-fedora.patch
 
@@ -48,7 +48,7 @@
 cp -p %{SOURCE3} README.Fedora
 
 %build
-make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS"
+make %{?_smp_mflags} OPTFLAGS="$RPM_OPT_FLAGS" USE_PAM=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Aug  6 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.3.0-1
+- version upgrade
+
 * Mon Aug  6 2007 Anders F Bjorklund <afb at users.sourceforge.net> 1.2.6-6
 - require system-logos instead of fedora-logos (#250365)