[dvtm] 0.9 bump, various new enhancements
Petr Šabata
psabata at fedoraproject.org
Thu Apr 4 07:58:39 UTC 2013
commit b35c037ddab3f9a79c050e77931c1c4c3cea3de5
Author: Petr Šabata <contyk at redhat.com>
Date: Thu Apr 4 09:58:34 2013 +0200
0.9 bump, various new enhancements
- We now ship our own terminfo
.gitignore | 1 +
Makefile-0.5.2.patch | 36 ------------------------------------
dvtm-0.9-build.patch | 40 ++++++++++++++++++++++++++++++++++++++++
dvtm.spec | 20 ++++++++++++++------
sources | 2 +-
5 files changed, 56 insertions(+), 43 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 372dcd6..488af3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
dvtm-0.5.2.tar.gz
/dvtm-0.7.tar.gz
/dvtm-0.8.tar.gz
+/dvtm-0.9.tar.gz
diff --git a/dvtm-0.9-build.patch b/dvtm-0.9-build.patch
new file mode 100644
index 0000000..abf2849
--- /dev/null
+++ b/dvtm-0.9-build.patch
@@ -0,0 +1,40 @@
+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 dcc822d..46aad54 100644
--- a/dvtm.spec
+++ b/dvtm.spec
@@ -1,12 +1,13 @@
Name: dvtm
-Version: 0.8
-Release: 2%{?dist}
+Version: 0.9
+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: Makefile-0.5.2.patch
+Patch0: %{name}-0.9-build.patch
+BuildRequires: ncurses
BuildRequires: ncurses-devel
%description
@@ -17,22 +18,29 @@ programs like vim, mutt, cmus or irssi.
%prep
%setup -q
-%patch0 -p1 -b .Makefile
+%patch0 -p1 -b .build
%build
-sed -i 's/PREFIX.*local*/PREFIX\ =\ \/usr\//' config.mk
-CFLAGS="%{optflags}" make %{?_smp_mflags}
+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
%files
%doc LICENSE README
%{_bindir}/%{name}
%{_bindir}/%{name}-status
%{_mandir}/man1/%{name}.1*
+%{_datadir}/terminfo/d
%changelog
+* Wed Apr 03 2013 Petr Šabata <contyk at redhat.com> - 0.9-1
+- 0.9 bump, various new enhancements
+- We now ship our own terminfo
+
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 847f0a0..0b2858a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c565067557c9be4cdc63aecd0932452e dvtm-0.8.tar.gz
+7de1103abb0ca410f7250cf89f019a38 dvtm-0.9.tar.gz
More information about the scm-commits
mailing list