From 8e0dd1ada307593418ab7ebda0880cf6700bff05 Mon Sep 17 00:00:00 2001 From: Eric Christensen Date: Jan 31 2012 15:00:34 +0000 Subject: Updating to latest version of TuDu. --- diff --git a/.gitignore b/.gitignore index 5376baf..ed62e53 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /tudu-0.7.tar.gz +/tudu-0.8.1.tar.gz diff --git a/Makefile-tudu.patch b/Makefile-tudu.patch deleted file mode 100644 index 6f94cd4..0000000 --- a/Makefile-tudu.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index 260c8f1..5267ecc 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,6 +1,6 @@ --DESTDIR=/usr/local -+DESTDIR=/usr - BIN_DIR=$(DESTDIR)/bin --ETC_DIR=$(DESTDIR)/etc -+ETC_DIR=/etc - SHARE_DIR=$(DESTDIR)/share/tudu - MAN_DIR=$(DESTDIR)/share/man - diff --git a/Makefile-tudu2.patch b/Makefile-tudu2.patch deleted file mode 100644 index 5a38111..0000000 --- a/Makefile-tudu2.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Makefile b/Makefile -index 4a139fc..504854c 100644 ---- a/Makefile -+++ b/Makefile -@@ -2,7 +2,7 @@ PROG=tudu - SRCS=tudu.cc data.cc editor.cc interface.cc window.cc text.cc parser.cc - SRCS+= config.cc date.cc screen.cc sched.cc cmd.cc - CXX=g++ --CFLAGS=-Wall -O2 -DSHARE_DIR=\"$(SHARE_DIR)\" -DETC_DIR=\"$(ETC_DIR)\" -+CFLAGS+= -DSHARE_DIR=\"$(SHARE_DIR)\" -DETC_DIR=\"$(ETC_DIR)\" - - OBJS=$(SRCS:.cc=.o) - diff --git a/sources b/sources index c83f6b3..6e09711 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -30c2a568ce9e0e5a0fe30746caa3c290 tudu-0.7.tar.gz +ba3c2ffacccca840e07918e115484d49 tudu-0.8.1.tar.gz diff --git a/tudu-0.8.1-1.fc17.src.rpm b/tudu-0.8.1-1.fc17.src.rpm new file mode 100644 index 0000000..9365c2e Binary files /dev/null and b/tudu-0.8.1-1.fc17.src.rpm differ diff --git a/tudu.2.patch b/tudu.2.patch new file mode 100644 index 0000000..e0d76e3 --- /dev/null +++ b/tudu.2.patch @@ -0,0 +1,12 @@ +diff -up tudu-0.8.1/configure.orig tudu-0.8.1/configure +--- tudu-0.8.1/configure.orig 2012-01-31 09:49:44.228826683 -0500 ++++ tudu-0.8.1/configure 2012-01-31 09:49:54.132769367 -0500 +@@ -98,7 +98,7 @@ done + : ${INSTALL_DIR:=${INSTALL} -d} + : ${INSTALL_DATA:=${INSTALL} -m 644} + : ${INSTALL_SCRIPT:=${INSTALL} -m 755} +-: ${INSTALL_PROGRAM:=${INSTALL} -m 755 -s} ++: ${INSTALL_PROGRAM:=${INSTALL} -m 755} + : ${INSTALL_MAN:=${INSTALL} -m 444} + : ${INSTALL_LIB:=${INSTALL} -c} + PKGNAME='tudu' ; VERSION='0.8.1' ; CONTACT_MAIL="meskio@sindominio.net" ; CONTACT_NAME="Ruben Pollan" ; CONTACT="Ruben Pollan " ; diff --git a/tudu.patch b/tudu.patch new file mode 100644 index 0000000..a46d90b --- /dev/null +++ b/tudu.patch @@ -0,0 +1,21 @@ +diff -up tudu-0.8.1/configure.old tudu-0.8.1/configure +--- tudu-0.8.1/configure.old 2012-01-13 11:45:07.334622544 -0500 ++++ tudu-0.8.1/configure 2012-01-17 09:40:00.910492121 -0500 +@@ -217,7 +217,7 @@ echo "OPTIONAL: libncursesw" + "--localstatedir") + LOCALSTATEDIR="$value"; ;; + "--libdir") +- LIBDIR="$value"; LDFLAGS="${LDFLAGS} -L$value -Wl,-R$value"; ;; ++ LIBDIR="$value"; LDFLAGS="${LDFLAGS} -L$value"; ;; + "--includedir") + INCLUDEDIR="$value"; CFLAGS="${CFLAGS} -I$value"; ;; + "--infodir") +@@ -283,7 +283,7 @@ echo "ERROR: ${CXX} cannot create execut + do_remove + exit 1 + fi +-CXXFLAGS="${CXXFLAGS} -Wall -O2" ++CXXFLAGS="${CXXFLAGS} -g -Wall -O2" + SRCS="${SRCS} tudu.cc data.cc editor.cc interface.cc window.cc text.cc parser.cc config.cc date.cc screen.cc sched.cc cmd.cc" + check_include() { + VAR=$1 diff --git a/tudu.spec b/tudu.spec index a03fcf6..d71d146 100644 --- a/tudu.spec +++ b/tudu.spec @@ -1,15 +1,15 @@ Name: tudu -Version: 0.7 -Release: 4%{?dist} +Version: 0.8.1 +Release: 1%{?dist} Summary: A simple, command line interface to do list application Group: Applications/Productivity License: GPLv3 URL: http://cauterized.net/~meskio/tudu/ -Source0: http://cauterized.net/~meskio/tudu/tudu-0.7.tar.gz -Patch0: Makefile-tudu.patch -Patch1: Makefile-tudu2.patch +Source0: http://cauterized.net/~meskio/tudu/tudu-0.8.1.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: tudu.patch +Patch1: tudu.2.patch BuildRequires: gcc-c++ BuildRequires: ncurses-devel @@ -22,20 +22,16 @@ a scheduled date. There are categories and priorities. %prep %setup -q %patch0 -p1 -pushd src %patch1 -p1 -sed -i -e "1 i \ -CFLAGS=%{optflags} -" Makefile -popd %build +%configure make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT BIN_DIR=$RPM_BUILD_ROOT%{_bindir} SHARE_DIR=$RPM_BUILD_ROOT/usr/share/tudu MAN_DIR=$RPM_BUILD_ROOT/usr/share/man ETC_DIR=$RPM_BUILD_ROOT/etc +make install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -47,12 +43,24 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/%{name} %{_mandir}/man1/%{name}* %{_datadir}/%{name} -%{_sysconfdir}/* %config(noreplace) /etc/tudurc %changelog -* Sat Jan 14 2012 Fedora Release Engineering - 0.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild +* Tue Dec 20 2011 Eric "Sparks" Christensen - 0.8.1-1 +- Updated to version 0.8.1 +- Added arrow keys on date editor +- Added support for non-latin keybinding pairs +- Fixed wrong plotting while change tudu task position +- Fixed category problems (autofill, showonly, ...) +- Fixed Makefile problems reported on debian bug #611077 +- Removed freeze on moving task +- Added ./configure script compatible with autotools +- Added multiple category support +- Added support for non-fix length categories +- Added warning color to old scheduled tasks in sched +- Added AvPag and RvPag to normal interface +- Fixed display when the length of the title equal to the screen +- Fixed problems with updating sched when the title changes * Wed Feb 09 2011 Fedora Release Engineering - 0.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild