diff --git a/.gitignore b/.gitignore index ce92c80..53142d2 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ dvtm-0.5.2.tar.gz /dvtm-0.10.tar.gz /dvtm-0.11.tar.gz /dvtm-0.12.tar.gz +/dvtm-0.13.tar.gz diff --git a/dvtm-0.12-build.patch b/dvtm-0.12-build.patch deleted file mode 100644 index 9cab6fc..0000000 --- a/dvtm-0.12-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/Makefile b/Makefile -index abef9a9..1edeb7e 100644 ---- a/Makefile -+++ b/Makefile -@@ -43,20 +43,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}${PREFIX}/share/terminfo -s dvtm.info - - uninstall: - @echo removing executable file from ${DESTDIR}${PREFIX}/bin -diff --git a/config.mk b/config.mk -index 05106e5..f6b68ac 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 += ${LIBS} - - DEBUG_CFLAGS = ${CFLAGS} -UNDEBUG -O0 -g -ggdb -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter diff --git a/dvtm-0.13-build.patch b/dvtm-0.13-build.patch new file mode 100644 index 0000000..5ce20d1 --- /dev/null +++ b/dvtm-0.13-build.patch @@ -0,0 +1,33 @@ +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.spec b/dvtm.spec index d907096..61b1728 100644 --- a/dvtm.spec +++ b/dvtm.spec @@ -1,12 +1,12 @@ Name: dvtm -Version: 0.12 -Release: 2%{?dist} +Version: 0.13 +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.12-build.patch +Patch0: %{name}-0.13-build.patch BuildRequires: ncurses BuildRequires: ncurses-devel @@ -21,13 +21,10 @@ programs like vim, mutt, cmus or irssi. %patch0 -p1 -b .build %build -sed -i 's!PREFIX.*local*!PREFIX = %{_prefix}!' config.mk make %{?_smp_mflags} %install -make install DESTDIR=%{buildroot} -mkdir -p %{buildroot}/%{_datadir}/terminfo/d && \ - tic -s -o %{buildroot}%{_datadir}/terminfo/ %{name}.info +make install DESTDIR=%{buildroot} PREFIX=%{_prefix} %files %doc LICENSE README @@ -37,6 +34,9 @@ mkdir -p %{buildroot}/%{_datadir}/terminfo/d && \ %{_datadir}/terminfo/d %changelog +* Tue Nov 18 2014 Petr Ĺ abata - 0.13-1 +- 0.13 bump + * Sat Aug 16 2014 Fedora Release Engineering - 0.12-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 2a883aa..f7545bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ce102246802bf443226c23e1e43aed3a dvtm-0.12.tar.gz +f4ab17eb6e79939182a40f66968ca5d0 dvtm-0.13.tar.gz