rpms/dzen2/devel dzen2-0.8.5-2010-01-04-fedora-config.patch, 1.1, 1.2 dzen2.spec, 1.4, 1.5

[Till Maas]

Author: till

Update of /cvs/pkgs/rpms/dzen2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19710

Modified Files:
	dzen2-0.8.5-2010-01-04-fedora-config.patch dzen2.spec 
Log Message:
* Mon Jan 04 2010 Till Maas <opensource at till.name> - 0.8.5-7.20100104svn
- Update to svn snapshot to support Xft and docking RedHat Bugzilla #552386


dzen2-0.8.5-2010-01-04-fedora-config.patch:
 config.mk         |   10 +++++-----
 gadgets/config.mk |    6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

Index: dzen2-0.8.5-2010-01-04-fedora-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/dzen2/devel/dzen2-0.8.5-2010-01-04-fedora-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- dzen2-0.8.5-2010-01-04-fedora-config.patch	4 Jan 2010 22:53:39 -0000	1.1
+++ dzen2-0.8.5-2010-01-04-fedora-config.patch	4 Jan 2010 23:02:13 -0000	1.2
@@ -1,6 +1,39 @@
+diff -up dzen2-0.8.5-2010-01-04/config.mk.fedora-config dzen2-0.8.5-2010-01-04/config.mk
+--- dzen2-0.8.5-2010-01-04/config.mk.fedora-config	2010-01-04 23:53:18.000000000 +0100
++++ dzen2-0.8.5-2010-01-04/config.mk	2010-01-04 23:53:25.000000000 +0100
+@@ -39,8 +39,8 @@ INCS = -I. -I/usr/include -I${X11INC}
+ 
+ 
+ ## Option 5: With XFT
+-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs xft`
+-CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XFT `pkg-config --cflags xft`
++#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs xft`
++#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XFT `pkg-config --cflags xft`
+ 
+ 
+ ## Option 6: With XPM and XFT
+@@ -49,15 +49,15 @@ CFLAGS = -Wall -Os ${INCS} -DVERSION=\"$
+ 
+ 
+ ## Option 7: With Xinerama and XPM and XFT
+-#LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lXinerama -lXpm `pkg-config --libs xft`
+-#CFLAGS = -Wall -Os ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`
++LIBS = -L$(LIBDIR) -lc -L${X11LIB} -lX11 -lXinerama -lXpm `pkg-config --libs xft`
++CFLAGS = $(RPM_OPT_FLAGS) -Wall ${INCS} -DVERSION=\"${VERSION}\" -DDZEN_XINERAMA -DDZEN_XPM -DDZEN_XFT `pkg-config --cflags xft`
+ 
+ 
+ 
+ # END of feature configuration
+ 
+ 
+-LDFLAGS = ${LIBS}
++LDFLAGS = $(RPM_OPT_FLAGS) ${LIBS}
+ 
+ # Solaris, uncomment for Solaris
+ #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
 diff -up dzen2-0.8.5-2010-01-04/gadgets/config.mk.fedora-config dzen2-0.8.5-2010-01-04/gadgets/config.mk
 --- dzen2-0.8.5-2010-01-04/gadgets/config.mk.fedora-config	2007-07-20 11:30:48.000000000 +0200
-+++ dzen2-0.8.5-2010-01-04/gadgets/config.mk	2010-01-04 23:41:42.000000000 +0100
++++ dzen2-0.8.5-2010-01-04/gadgets/config.mk	2010-01-04 23:53:04.000000000 +0100
 @@ -8,10 +8,10 @@ X11INC = /usr/X11R6/include
  INCS = -I. -I/usr/include -I${X11INC}
  


Index: dzen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dzen2/devel/dzen2.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- dzen2.spec	4 Jan 2010 22:55:09 -0000	1.4
+++ dzen2.spec	4 Jan 2010 23:02:13 -0000	1.5
@@ -27,6 +27,8 @@ Patch2:         dzen2-0.8.5-2010-01-04-f
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libXpm-devel libXinerama-devel
+# for /usr/include/X11/Xft/Xft.h
+BuildRequires:  libXft-devel
 
 %description
 Dzen is a general purpose messaging, notification and menuing program for X11.