rpms/dzen2/F-12 dzen2-0.8.5-2010-01-04-fedora-config.patch, NONE, 1.1 dzen2-0.8.5-2010-01-04-verbose.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 dzen2.spec, 1.2, 1.3 sources, 1.2, 1.3 dzen2-0.8.5-verbose.patch, 1.1, NONE
Till Maas
till at fedoraproject.org
Mon Jan 4 23:27:41 UTC 2010
Author: till
Update of /cvs/pkgs/rpms/dzen2/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24379
Modified Files:
.cvsignore dzen2.spec sources
Added Files:
dzen2-0.8.5-2010-01-04-fedora-config.patch
dzen2-0.8.5-2010-01-04-verbose.patch
Removed Files:
dzen2-0.8.5-verbose.patch
Log Message:
sync with devel
dzen2-0.8.5-2010-01-04-fedora-config.patch:
config.mk | 10 +++++-----
gadgets/config.mk | 6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
--- NEW FILE dzen2-0.8.5-2010-01-04-fedora-config.patch ---
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:53:04.000000000 +0100
@@ -8,10 +8,10 @@ X11INC = /usr/X11R6/include
INCS = -I. -I/usr/include -I${X11INC}
X11LIB = /usr/X11R6/lib
-LIBS = -L/usr/lib
+LIBS = -L$(LIBDIR)
-CFLAGS = -Os ${INCS}
-LDFLAGS = ${LIBS}
+CFLAGS = $(RPM_OPT_FLAGS) -Os ${INCS}
+LDFLAGS = $(RPM_OPT_FLAGS) ${LIBS}
# compiler and linker
CC = gcc
dzen2-0.8.5-2010-01-04-verbose.patch:
Makefile | 5 ++---
gadgets/Makefile | 14 +++++---------
2 files changed, 7 insertions(+), 12 deletions(-)
--- NEW FILE dzen2-0.8.5-2010-01-04-verbose.patch ---
diff -up dzen2-0.8.5-2010-01-04/Makefile.verbose dzen2-0.8.5-2010-01-04/Makefile
--- dzen2-0.8.5-2010-01-04/Makefile.verbose 2009-02-02 02:44:07.000000000 +0100
+++ dzen2-0.8.5-2010-01-04/Makefile 2010-01-04 23:53:48.000000000 +0100
@@ -17,14 +17,13 @@ options:
.c.o:
@echo CC $<
- @${CC} -c ${CFLAGS} $<
+ ${CC} -c ${CFLAGS} $<
${OBJ}: dzen.h action.h config.mk
dzen2: ${OBJ}
@echo LD $@
- @${LD} -o $@ ${OBJ} ${LDFLAGS}
- @strip $@
+ ${LD} -o $@ ${OBJ} ${LDFLAGS}
@echo "Run ./help for documentation"
clean:
diff -up dzen2-0.8.5-2010-01-04/gadgets/Makefile.verbose dzen2-0.8.5-2010-01-04/gadgets/Makefile
--- dzen2-0.8.5-2010-01-04/gadgets/Makefile.verbose 2008-01-04 22:57:27.000000000 +0100
+++ dzen2-0.8.5-2010-01-04/gadgets/Makefile 2010-01-05 00:04:14.000000000 +0100
@@ -17,31 +17,27 @@ options:
.c.o:
@echo CC $<
- @${CC} -c ${CFLAGS} $<
+ ${CC} -c ${CFLAGS} $<
${OBJ}: dbar.h config.mk
dbar: ${OBJ}
@echo LD $@
- @${LD} -o $@ dbar-main.o dbar.o ${LDFLAGS}
- @strip $@
+ ${LD} -o $@ dbar-main.o dbar.o ${LDFLAGS}
gdbar: ${OBJ}
@echo LD $@
# @${LD} -o $@ gdbar.o dbar.o ${LDFLAGS} -L${X11LIB} -lX11
- @${LD} -o $@ gdbar.o dbar.o ${LDFLAGS}
- @strip $@
+ ${LD} -o $@ gdbar.o dbar.o ${LDFLAGS}
gcpubar: ${OBJ}
@echo LD $@
# @${LD} -o $@ gcpubar.o dbar.o ${LDFLAGS} -L${X11LIB}
- @${LD} -o $@ gcpubar.o dbar.o ${LDFLAGS}
- @strip $@
+ ${LD} -o $@ gcpubar.o dbar.o ${LDFLAGS}
textwidth: ${OBJ}
@echo LD $@
- @${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
- @strip $@
+ ${LD} -o $@ textwidth.o ${LDFLAGS} -L${X11LIB} -lX11
clean:
@echo cleaning
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dzen2/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 28 Aug 2009 16:14:08 -0000 1.2
+++ .cvsignore 4 Jan 2010 23:27:40 -0000 1.3
@@ -1 +1 @@
-dzen2-latest.tar.gz
+dzen2-0.8.5-2010-01-04.tar.gz
Index: dzen2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dzen2/F-12/dzen2.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- dzen2.spec 16 Sep 2009 18:28:35 -0000 1.2
+++ dzen2.spec 4 Jan 2010 23:27:40 -0000 1.3
@@ -1,27 +1,34 @@
Name: dzen2
Version: 0.8.5
-Release: 6%{?dist}
+Release: 7.20100104svn%{?dist}
Summary: A general purpose messaging and notification program
Group: User Interface/X
License: MIT
URL: http://gotmor.googlepages.com/dzen
-Source0: http://gotmor.googlepages.com/%{name}-latest.tar.gz
+# created with dzen2-tarballl 20100-01-04
+Source0: %{name}-%{version}-2010-01-04.tar.gz
+#Source0: http://gotmor.googlepages.com/%{name}-latest.tar.gz
Source1: dzen2.1
Source2: dzen2-dbar.1
Source3: dzen2-gcpubar.1
Source4: dzen2-gdbar.1
Source5: dzen2-textwidth.1
+# tarball generation script
+Source10: dzen2-tarball
# 2007-12-26: sent to upstream via private e-mail, inclusion depends on usability
# for *BSD and Solaris
-Patch0: dzen2-0.8.5-check_environment.patch
+#Patch0: dzen2-0.8.5-check_environment.patch
# Not sent to upstream: removes strip and shows cc invocations, which seems not to
# be wanted by upstream
-Patch1: dzen2-0.8.5-verbose.patch
+Patch1: dzen2-0.8.5-2010-01-04-verbose.patch
+Patch2: dzen2-0.8.5-2010-01-04-fedora-config.patch
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.
@@ -30,23 +37,21 @@ managers like dwm, wmii and xmonad, thou
%prep
-%setup -q
-%patch0 -p1 -b .check_environment
+%setup -q -n %{name}-%{version}-2010-01-04
+#%patch0 -p1 -b .check_environment
%patch1 -p1 -b .verbose
+%patch2 -p1 -b .fedora-config
-%build
-export CFLAGS="${RPM_OPT_FLAGS}"
-export LDFLAGS="${RPM_OPT_FLAGS}"
-make %{?_smp_mflags} DZEN_XINERAMA=1 DZEN_XPM=1
-make -C gadgets %{?_smp_mflags}
+make %{?_smp_mflags} LIBDIR="%{_libdir}"
+make -C gadgets %{?_smp_mflags} LIBDIR="%{_libdir}"
%install
rm -rf $RPM_BUILD_ROOT
mkdir $RPM_BUILD_ROOT
export CFLAGS="${RPM_OPT_FLAGS}"
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} DZEN_XINERAMA=1 DZEN_XPM=1
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}
make -C gadgets install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}
for gadget in dbar gcpubar gdbar textwidth
do
@@ -84,8 +89,11 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* 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
+
* Wed Sep 16 2009 Till Maas <opensource at till.name> - 0.8.5-6
-- Fix some types in %%description
+- Fix some typos in %%description
* Thu Aug 27 2009 Till Maas <opensource at till.name> - 0.8.5-5
- Remove uneeded PREFIX= argument to make in %%build
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dzen2/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 28 Aug 2009 16:14:08 -0000 1.2
+++ sources 4 Jan 2010 23:27:40 -0000 1.3
@@ -1 +1 @@
-5978620c2124c8a8ad52d7f17ce94fd7 dzen2-latest.tar.gz
+65609d5ad436a211436c49dd2a71ec85 dzen2-0.8.5-2010-01-04.tar.gz
--- dzen2-0.8.5-verbose.patch DELETED ---
More information about the fedora-extras-commits
mailing list