diff --git a/.gitignore b/.gitignore index 53142d2..1a90ba2 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ dvtm-0.5.2.tar.gz /dvtm-0.11.tar.gz /dvtm-0.12.tar.gz /dvtm-0.13.tar.gz +/dvtm-0.14.tar.gz diff --git a/dvtm-0.13-build.patch b/dvtm-0.13-build.patch deleted file mode 100644 index 5ce20d1..0000000 --- a/dvtm-0.13-build.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/Makefile b/Makefile -index 753ed2c..9adeb3a 100644 ---- a/Makefile -+++ b/Makefile -@@ -43,13 +43,11 @@ dist: clean - @rm -rf dvtm-${VERSION} - - install: dvtm -- @echo stripping executable -- @${STRIP} 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 -diff --git a/config.mk b/config.mk -index aadf326..dd05c67 100644 ---- a/config.mk -+++ b/config.mk -@@ -21,7 +21,7 @@ LIBS = -lc -lutil -lncursesw - # Cygwin - #INCS = -I/usr/include/ncurses - --CFLAGS += -std=c99 -Os ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -+CFLAGS += -std=c99 ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 ${RPM_OPT_FLAGS} - LDFLAGS += ${LIBS} - - DEBUG_CFLAGS = ${CFLAGS} -UNDEBUG -O0 -g -ggdb -Wall -Wextra -Wno-unused-parameter diff --git a/dvtm-0.14-build.patch b/dvtm-0.14-build.patch new file mode 100644 index 0000000..22d8bdd --- /dev/null +++ b/dvtm-0.14-build.patch @@ -0,0 +1,33 @@ +diff --git a/Makefile b/Makefile +index e0284b8..ee2feec 100644 +--- a/Makefile ++++ b/Makefile +@@ -43,13 +43,11 @@ dist: clean + @rm -rf dvtm-${VERSION} + + install: dvtm +- @echo stripping executable +- @${STRIP} 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 +diff --git a/config.mk b/config.mk +index 273aa45..3bf221b 100644 +--- a/config.mk ++++ b/config.mk +@@ -12,7 +12,7 @@ TERMINFO := ${DESTDIR}${PREFIX}/share/terminfo + INCS = -I. + LIBS = -lc -lutil -lncursesw + CPPFLAGS = -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=700 -D_XOPEN_SOURCE_EXTENDED +-CFLAGS += -std=c99 ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG ${CPPFLAGS} ++CFLAGS += -std=c99 ${INCS} -DVERSION=\"${VERSION}\" -DNDEBUG ${CPPFLAGS} ${RPM_OPT_FLAGS} + LDFLAGS += ${LIBS} + + DEBUG_CFLAGS = ${CFLAGS} -UNDEBUG -O0 -g -ggdb -Wall -Wextra -Wno-unused-parameter diff --git a/dvtm.spec b/dvtm.spec index 61b1728..9ff7a64 100644 --- a/dvtm.spec +++ b/dvtm.spec @@ -1,12 +1,12 @@ Name: dvtm -Version: 0.13 +Version: 0.14 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.13-build.patch +Patch0: %{name}-0.14-build.patch BuildRequires: ncurses BuildRequires: ncurses-devel @@ -34,6 +34,9 @@ make install DESTDIR=%{buildroot} PREFIX=%{_prefix} %{_datadir}/terminfo/d %changelog +* Fri Feb 20 2015 Petr Šabata - 0.14-1 +- 0.14 bump + * Tue Nov 18 2014 Petr Šabata - 0.13-1 - 0.13 bump diff --git a/sources b/sources index f7545bf..1b95d25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f4ab17eb6e79939182a40f66968ca5d0 dvtm-0.13.tar.gz +44ec5176b1996fdffd97cabe9a35ea0c dvtm-0.14.tar.gz