From 224821dd773e7d033e4dd858d4debd18286078d6 Mon Sep 17 00:00:00 2001 From: Petr Šabata Date: Jan 06 2014 13:22:06 +0000 Subject: 0.10 bugfix and enhancement bump --- diff --git a/.gitignore b/.gitignore index 488af3b..77c1d06 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ dvtm-0.5.2.tar.gz /dvtm-0.7.tar.gz /dvtm-0.8.tar.gz /dvtm-0.9.tar.gz +/dvtm-0.10.tar.gz diff --git a/dvtm-0.10-build.patch b/dvtm-0.10-build.patch new file mode 100644 index 0000000..81e1d3b --- /dev/null +++ b/dvtm-0.10-build.patch @@ -0,0 +1,40 @@ +diff --git a/Makefile b/Makefile +index eb849f4..03fc50f 100644 +--- a/Makefile ++++ b/Makefile +@@ -42,20 +42,16 @@ dist: clean + @rm -rf dvtm-${VERSION} + + install: dvtm +- @echo stripping executable +- @strip -s dvtm + @echo installing executable file to ${DESTDIR}${PREFIX}/bin + @mkdir -p ${DESTDIR}${PREFIX}/bin +- @cp -f dvtm ${DESTDIR}${PREFIX}/bin ++ @cp -pf dvtm ${DESTDIR}${PREFIX}/bin + @chmod 755 ${DESTDIR}${PREFIX}/bin/dvtm +- @cp -f dvtm-status ${DESTDIR}${PREFIX}/bin ++ @cp -pf dvtm-status ${DESTDIR}${PREFIX}/bin + @chmod 755 ${DESTDIR}${PREFIX}/bin/dvtm-status + @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1 + @mkdir -p ${DESTDIR}${MANPREFIX}/man1 + @sed "s/VERSION/${VERSION}/g" < dvtm.1 > ${DESTDIR}${MANPREFIX}/man1/dvtm.1 + @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dvtm.1 +- @echo installing terminfo description +- @tic -o ${DESTDIR}/usr/share/terminfo -s dvtm.info + + uninstall: + @echo removing executable file from ${DESTDIR}${PREFIX}/bin +diff --git a/config.mk b/config.mk +index bf2b565..3d09255 100644 +--- a/config.mk ++++ b/config.mk +@@ -15,7 +15,7 @@ LIBS = -lc -lutil -lncursesw + # Cygwin + #INCS += -I/usr/include/ncurses + +-CFLAGS += -std=c99 -Os ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG ++CFLAGS += -std=c99 -Os ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG ${RPM_OPT_FLAGS} + LDFLAGS += -L/usr/lib -L/usr/local/lib ${LIBS} + + DEBUG_CFLAGS = ${CFLAGS} -UNDEBUG -O0 -g -ggdb -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter diff --git a/dvtm-0.9-build.patch b/dvtm-0.9-build.patch deleted file mode 100644 index abf2849..0000000 --- a/dvtm-0.9-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/Makefile b/Makefile -index ff85deb..03fc50f 100644 ---- a/Makefile -+++ b/Makefile -@@ -42,20 +42,16 @@ dist: clean - @rm -rf dvtm-${VERSION} - - install: dvtm -- @echo stripping executable -- @strip -s dvtm - @echo installing executable file to ${DESTDIR}${PREFIX}/bin - @mkdir -p ${DESTDIR}${PREFIX}/bin -- @cp -f dvtm ${DESTDIR}${PREFIX}/bin -+ @cp -pf dvtm ${DESTDIR}${PREFIX}/bin - @chmod 755 ${DESTDIR}${PREFIX}/bin/dvtm -- @cp -f dvtm-status ${DESTDIR}${PREFIX}/bin -+ @cp -pf dvtm-status ${DESTDIR}${PREFIX}/bin - @chmod 755 ${DESTDIR}${PREFIX}/bin/dvtm-status - @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1 - @mkdir -p ${DESTDIR}${MANPREFIX}/man1 - @sed "s/VERSION/${VERSION}/g" < dvtm.1 > ${DESTDIR}${MANPREFIX}/man1/dvtm.1 - @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dvtm.1 -- @echo installing terminfo description -- @tic -s dvtm.info - - uninstall: - @echo removing executable file from ${DESTDIR}${PREFIX}/bin -diff --git a/config.mk b/config.mk -index ac4e604..5d8f9fb 100644 ---- a/config.mk -+++ b/config.mk -@@ -15,7 +15,7 @@ LIBS = -lc -lutil -lncursesw - # Cygwin - #INCS += -I/usr/include/ncurses - --CFLAGS += -std=c99 -Os ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG -+CFLAGS += -std=c99 -Os ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG ${RPM_OPT_FLAGS} - LDFLAGS += -L/usr/lib -L/usr/local/lib ${LIBS} - - DEBUG_CFLAGS = ${CFLAGS} -UNDEBUG -O0 -g -ggdb -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter diff --git a/dvtm.spec b/dvtm.spec index 8fba37e..0f44830 100644 --- a/dvtm.spec +++ b/dvtm.spec @@ -1,12 +1,12 @@ Name: dvtm -Version: 0.9 -Release: 2%{?dist} +Version: 0.10 +Release: 1%{?dist} Summary: Tiling window management for the console Group: Applications/System License: MIT and ISC URL: http://www.brain-dump.org/projects/%{name}/ Source0: http://www.brain-dump.org/projects/%{name}/%{name}-%{version}.tar.gz -Patch0: %{name}-0.9-build.patch +Patch0: %{name}-0.10-build.patch BuildRequires: ncurses BuildRequires: ncurses-devel @@ -37,6 +37,9 @@ mkdir -p %{buildroot}/%{_datadir}/terminfo/d && \ %{_datadir}/terminfo/d %changelog +* Mon Jan 06 2014 Petr Šabata - 0.10-1 +- 0.10 bugfix and enhancement bump + * Sat Aug 03 2013 Fedora Release Engineering - 0.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 0b2858a..1ab3731 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7de1103abb0ca410f7250cf89f019a38 dvtm-0.9.tar.gz +0c7167dc898df1693c20e2a34ba3e947 dvtm-0.10.tar.gz