[spectrwm] Resolves: rhbz#1095890, rhbz#1095967, install licenses
Lokesh Mandvekar
lsm5 at fedoraproject.org
Sun Jul 13 07:36:55 UTC 2014
commit 9de55130dd77073fa08c77c4818e21b01636422e
Author: Lokesh Mandvekar <lsm5 at fedoraproject.org>
Date: Sun Jul 13 02:29:34 2014 -0500
Resolves: rhbz#1095890, rhbz#1095967, install licenses
sources | 2 +-
spectrwm.spec | 55 +++++++++++++++++++++++++++++++------------------------
2 files changed, 32 insertions(+), 25 deletions(-)
---
diff --git a/sources b/sources
index f651bee..8d5c5dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-22355256693393779b2d366d312c4577 spectrwm-2.5.0.tgz
+d9aec3342920e31cbe60f1032571043a spectrwm-2.5.1.tgz
diff --git a/spectrwm.spec b/spectrwm.spec
index ce65a4c..2c24afb 100644
--- a/spectrwm.spec
+++ b/spectrwm.spec
@@ -1,9 +1,8 @@
Name: spectrwm
-Version: 2.5.0
-Release: 2%{?dist}
+Version: 2.5.1
+Release: 1%{?dist}
Summary: Minimalist tiling window manager written in C
License: ISC
-
URL: https://opensource.conformal.com/wiki/%{name}
Source0: https://opensource.conformal.com/snapshots/%{name}/%{name}-%{version}.tgz
BuildRequires: xcb-util-devel
@@ -26,49 +25,57 @@ It has sane defaults and does not require one to learn a
language to do any configuration. It was written by hackers
for hackers and it strives to be small, compact and fast.
-%package devel
-Requires: %{name} = %{version}-%{release}
-Summary: Spectrwm development files
-
-%description devel
-Contains development files used by %{name}.
-
%prep
%setup -q
iconv -f iso8859-1 -t utf-8 %{name}_es.1 > %{name}_es.1.conv
iconv -f iso8859-1 -t utf-8 %{name}_pt.1 > %{name}_pt.1.conv
mv -f %{name}_es.1.conv %{name}_es.1
mv -f %{name}_pt.1.conv %{name}_pt.1
+# Generate license files as per
+# https://opensource.conformal.com/wiki/spectrwm#License
+head -n14 version.h | tail -n13 | sed -e 's/ \* //g' -e 's/\*//g' > LICENSE
+head -n55 spectrwm.c | tail -n30 | sed -e 's/ \* //g' -e 's/\*//g' > LICENSE-dwm
+head -n38 lib/swm_hack.c | tail -n21 | sed -e 's/ \* //g' -e 's/\*//g' > LICENSE-LD_PRELOAD
%build
-make -C linux/ %{?_smp_mflags} PREFIX=%{_prefix} LIBDIR=%{_libdir}
+make CC="%{__cc} %{optflags} %{__global_ldflags}" -C linux/ %{?_smp_mflags} PREFIX=%{_prefix} LIBDIR=%{_libdir}
%install
-make -C linux/ install PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot}
+make CC="%{__cc} %{optflags} %{__global_ldflags}" -C linux/ install PREFIX=%{_prefix} LIBDIR=%{_libdir} DESTDIR=%{buildroot}
install -d %{buildroot}%{_sysconfdir}
-install -m 644 %{name}.conf %{buildroot}%{_sysconfdir}
-install -d -p %{buildroot}%{_datadir}/xsessions
-install -m 755 linux/%{name}.desktop %{buildroot}%{_datadir}/xsessions
+install -pm 644 %{name}.conf %{buildroot}%{_sysconfdir}
+install -dp %{buildroot}%{_datadir}/{%{name},xsessions}
+install -m 644 linux/%{name}.desktop %{buildroot}%{_datadir}/xsessions
+install baraction.sh %{buildroot}%{_datadir}/%{name}
+install initscreen.sh %{buildroot}%{_datadir}/%{name}
+install screenshot.sh %{buildroot}%{_datadir}/%{name}
+for l in es it pt ru ; do
+ mkdir -p %{buildroot}%{_mandir}/$l/man1
+ mv %{buildroot}%{_mandir}/man1/%{name}_$l.1 %{buildroot}%{_mandir}/$l/man1/%{name}.1
+done
+%find_lang %{name} --with-man
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%files
-%doc README.md
+%files -f %{name}.lang
+%doc LICENSE LICENSE-LD_PRELOAD LICENSE-dwm README.md
%config(noreplace) %{_sysconfdir}/%{name}.conf
%{_bindir}/%{name}
%{_bindir}/scrotwm
+%{_datadir}/%{name}/baraction.sh
+%{_datadir}/%{name}/initscreen.sh
+%{_datadir}/%{name}/screenshot.sh
%{_datadir}/xsessions/%{name}.desktop
+%{_libdir}/libswmhack.so*
%{_mandir}/man1/%{name}.1.gz
-%{_mandir}/man1/%{name}_es.1.gz
-%{_mandir}/man1/%{name}_it.1.gz
-%{_mandir}/man1/%{name}_pt.1.gz
-%{_mandir}/man1/%{name}_ru.1.gz
-%{_libdir}/libswmhack.so.*
-%files devel
-%{_libdir}/libswmhack.so
%changelog
+* Sun Jul 13 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 2.5.1-1
+- Resolves: rhbz#1095890 - upstream version bump to 2.5.1
+- Resolves: rhbz#1095967 - spectrwm packaging issues
+- generate and install appropriate licenses
+
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list