rpms/dzen2/devel 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 dzen2-tarball, 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 22:53:40 UTC 2010
Author: till
Update of /cvs/pkgs/rpms/dzen2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18572
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 dzen2-tarball
Removed Files:
dzen2-0.8.5-verbose.patch
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 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--- NEW FILE dzen2-0.8.5-2010-01-04-fedora-config.patch ---
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
@@ -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 | 12 ++++--------
2 files changed, 6 insertions(+), 11 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:37:29.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-04 23:38:43.000000000 +0100
@@ -23,25 +23,21 @@ ${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
--- NEW FILE dzen2-tarball ---
#!/bin/sh
REPOS="http://dzen.googlecode.com/svn/trunk/"
# Revison is ${1} when given
REVISION=${1:-$(date +%Y%m%d)}
VERSION=${2:-0.8.5}
NAME="${0%-tarball}-${VERSION}-${REVISION}"
echo USAGE: "${0} [DATE]"
echo "Creates a tarball with the sources from DATE"
echo "Format of DATE: YYYY-MM-DD"
echo "Default is today"
echo
echo Using revision ${REVISION}
if [[ ! -e ${NAME} && ! -e ${NAME}.tar.gz ]]
then
svn export -r "{${REVISION}}" ${REPOS} ${NAME} || \
(echo "svn export did not work, maybe wrong date format?" && exit 1)
tar czvf ${NAME}.tar.gz ${NAME}
rm -rf ${NAME}
else
echo "${NAME}(.tar.gz) does already exist"
fi
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/dzen2/devel/.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 22:53:39 -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/devel/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 22:53:39 -0000 1.3
@@ -1,24 +1,29 @@
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
@@ -30,23 +35,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,6 +87,9 @@ 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/dzen2/devel/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 22:53:39 -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