commit 8c9bc761ea1a5b23a3ef01b520028d698eb66172
Author: Elan Ruusamäe <[email protected]>
Date: Sat Mar 9 22:52:57 2013 +0200
up to 7, builds now
kmscon-link.patch | 30 +++++++++++++++---------------
kmscon.spec | 25 ++++++++++++++++++-------
2 files changed, 33 insertions(+), 22 deletions(-)
---
diff --git a/kmscon.spec b/kmscon.spec
index 97a150d..a042b95 100644
--- a/kmscon.spec
+++ b/kmscon.spec
@@ -1,4 +1,6 @@
-# TODO: allow to use systemd-enabled version without systemd running
+# TODO
+# - allow to use systemd-enabled version without systemd running
+# - modules can be put to subpackages
#
# Conditional build:
%bcond_without systemd # systemd-based multi-seat support
@@ -9,13 +11,13 @@
Summary: Simple terminal emulator based on Linux Kernel Mode Setting
(KMS)
Summary(pl.UTF-8): Prosty emulator terminala oparty na linuksowym KMS
(Kernel Mode Setting)
Name: kmscon
-Version: 6
+Version: 7
Release: 0.1
License: MIT (code), GPL (Unifont)
Group: Applications/Terminal
#Source0Download: https://github.com/dvdhrm/kmscon/downloads
-Source0:
https://github.com/downloads/dvdhrm/kmscon/%{name}-%{version}.tar.bz2
-# Source0-md5: 12f6966cef8e846f31dbcad916a9f347
+Source0:
https://github.com/dvdhrm/kmscon/archive/%{name}-%{version}.tar.gz
+# Source0-md5: a8e2339b74111091d771caf81bf2da6e
Patch1: %{name}-link.patch
URL: https://github.com/dvdhrm/kmscon/wiki/KMSCON
BuildRequires: Mesa-libEGL-devel
@@ -24,7 +26,6 @@ BuildRequires: Mesa-libgbm-devel
BuildRequires: autoconf >= 2.68
BuildRequires: automake >= 1:1.11
BuildRequires: dbus-devel
-BuildRequires: freetype-devel >= 2
BuildRequires: libdrm-devel
BuildRequires: libtool >= 2:2.2
BuildRequires: pango-devel
@@ -86,7 +87,7 @@ Static kmscon libraries.
Statyczne biblioteki kmscon.
%prep
-%setup -q
+%setup -q -n %{name}-%{name}-%{version}
%patch1 -p1
%build
@@ -109,6 +110,10 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+# modules dlopened, so static modules do not make sense
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/kmscon/mod-*.a
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/kmscon/mod-*.la
+
# keeping *.la because of missing all external dependencies in *.pc
%clean
@@ -121,6 +126,12 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc COPYING NEWS README
%attr(755,root,root) %{_bindir}/kmscon
+%{_mandir}/man1/kmscon.1*
+%dir %{_libdir}/kmscon
+%attr(755,root,root) %{_libdir}/kmscon/mod-bbulk.so
+%attr(755,root,root) %{_libdir}/kmscon/mod-gltex.so
+%attr(755,root,root) %{_libdir}/kmscon/mod-pango.so
+%attr(755,root,root) %{_libdir}/kmscon/mod-unifont.so
%files libs
%defattr(644,root,root,755)
@@ -141,7 +152,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libuterm.la
%{_includedir}/eloop.h
%{_includedir}/tsm_*.h
-%{_includedir}/uterm.h
+%{_includedir}/uterm_*.h
%{_pkgconfigdir}/libeloop.pc
%{_pkgconfigdir}/libtsm.pc
%{_pkgconfigdir}/libuterm.pc
diff --git a/kmscon-link.patch b/kmscon-link.patch
index 7cffa2f..94511a4 100644
--- a/kmscon-link.patch
+++ b/kmscon-link.patch
@@ -1,5 +1,5 @@
---- kmscon-6/Makefile.am~ 2013-03-09 20:27:31.000000000 +0200
-+++ kmscon-6/Makefile.am 2013-03-09 20:27:42.798733628 +0200
+--- kmscon-kmscon-7/Makefile.am~ 2013-03-09 21:41:00.000000000 +0200
++++ kmscon-kmscon-7/Makefile.am 2013-03-09 21:42:16.711615577 +0200
@@ -56,16 +56,6 @@
AM_LDFLAGS = \
-Wl,--as-needed
@@ -17,20 +17,20 @@
#
# SHL - Static Helper Library
# The SHL subsystem contains several small code pieces used all over kmscon
and
-@@ -112,7 +112,7 @@
- libeloop_la_CPPFLAGS += \
- $(DBUS_CFLAGS)
- libeloop_la_LIBADD += \
-- $(DBUS_LIBS)
-+ $(DBUS_LIBS) -lpthread
+@@ -198,7 +198,7 @@
+ external/dbus-loop.h \
+ external/dbus-loop.c
+ libeloop_la_CPPFLAGS += $(DBUS_CFLAGS)
+-libeloop_la_LIBADD += $(DBUS_LIBS)
++libeloop_la_LIBADD += $(DBUS_LIBS) -lpthread
endif
#
-@@ -156,6 +146,7 @@
- $(AM_CPPFLAGS)
+@@ -233,6 +233,7 @@
+ $(XKBCOMMON_CFLAGS)
+ libtsm_la_LIBADD = \
+ $(XKBCOMMON_LIBS) \
++ -lrt \
+ libshl.la
+ EXTRA_libtsm_la_DEPENDENCIES = ${top_srcdir}/docs/sym/libtsm.sym
libtsm_la_LDFLAGS = \
- -version-info 1:0:0
-+libtsm_la_LIBADD = -lrt
-
- #
- # libuterm
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kmscon.git/commitdiff/8c9bc761ea1a5b23a3ef01b520028d698eb66172
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
