From e3cfe55895c25a45e054998a457e7e2d875b2318 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Apr 22 2013 14:04:34 +0000 Subject: Initial import (#946856). --- diff --git a/.gitignore b/.gitignore index e69de29..0a5237e 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/spectrwm-2.2.0.tgz diff --git a/sources b/sources index e69de29..4c2c129 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +c572727b5fb9fe3674c03a7e51d191c4 spectrwm-2.2.0.tgz diff --git a/spectrwm-2.2.0-conf-file.patch b/spectrwm-2.2.0-conf-file.patch new file mode 100644 index 0000000..f780b2b --- /dev/null +++ b/spectrwm-2.2.0-conf-file.patch @@ -0,0 +1,27 @@ +--- spectrwm-2.2.0/linux/Makefile 2013-03-23 10:04:01.000000000 -0400 ++++ spectrwm-2.2.0.1/linux/Makefile 2013-04-02 12:08:13.518622154 -0400 +@@ -6,6 +6,7 @@ + BINDIR?= $(PREFIX)/bin + LIBDIR?= $(PREFIX)/lib + MANDIR?= $(PREFIX)/share/man ++SYSCONFDIR?= /etc + + CC?= gcc + +@@ -38,6 +39,7 @@ + install -m 755 -d $(DESTDIR)$(BINDIR) + install -m 755 -d $(DESTDIR)$(LIBDIR) + install -m 755 -d $(DESTDIR)$(MANDIR)/man1 ++ install -m 755 -d $(DESTDIR)$(SYSCONFDIR) + install -m 755 spectrwm $(DESTDIR)$(BINDIR) + install -m 755 libswmhack.so.$(LVERS) $(DESTDIR)$(LIBDIR) + install -m 644 ../spectrwm.1 $(DESTDIR)$(MANDIR)/man1/spectrwm.1 +@@ -45,7 +47,7 @@ + install -m 644 ../spectrwm_it.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_it.1 + install -m 644 ../spectrwm_pt.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_pt.1 + install -m 644 ../spectrwm_ru.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_ru.1 +- ln -sf $(DESTDIR)$(BINDIR)/spectrwm $(DESTDIR)$(BINDIR)/scrotwm ++ install -m 644 ../spectrwm.conf $(DESTDIR)$(SYSCONFDIR)/spectrwm.conf + + clean: + rm -f spectrwm *.o *.so libswmhack.so.* spectrwm.c swm_hack.c version.h diff --git a/spectrwm-2.2.0-versioned-shared-lib.patch b/spectrwm-2.2.0-versioned-shared-lib.patch new file mode 100644 index 0000000..4ecb32e --- /dev/null +++ b/spectrwm-2.2.0-versioned-shared-lib.patch @@ -0,0 +1,19 @@ +--- spectrwm-2.2.0/linux/Makefile 2013-04-13 16:34:47.863000000 -0400 ++++ spectrwm-2.2.0.1/linux/Makefile 2013-04-13 16:37:26.280000000 -0400 +@@ -11,6 +11,7 @@ + CC?= gcc + + LVERS= $(shell . ../lib/shlib_version; echo $$major.$$minor) ++MVERS= $(shell . ../lib/shlib_version; echo $$major) + + BUILDVERSION= $(shell sh $(CURDIR)/../buildver.sh) + ifneq ("${BUILDVERSION}", "") +@@ -33,7 +34,7 @@ + $(CC) $(CFLAGS) -c -fpic -DPIC $+ -o $@ + + libswmhack.so.$(LVERS): swm_hack.so +- $(CC) -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD) ++ $(CC) -Wl,-soname,libswmhack.so.$(MVERS) -shared -fpic -o libswmhack.so.$(LVERS) swm_hack.so $(LDADD) + + install: all + install -m 755 -d $(DESTDIR)$(BINDIR) diff --git a/spectrwm-2.2.0-versioned-shlib-symlinks.patch b/spectrwm-2.2.0-versioned-shlib-symlinks.patch new file mode 100644 index 0000000..3a9721a --- /dev/null +++ b/spectrwm-2.2.0-versioned-shlib-symlinks.patch @@ -0,0 +1,11 @@ +--- spectrwm-2.2.0/linux/Makefile 2013-04-15 10:13:01.180000000 -0400 ++++ spectrwm-2.2.0.1/linux/Makefile 2013-04-15 19:06:39.271000000 -0400 +@@ -43,6 +43,8 @@ + install -m 755 -d $(DESTDIR)$(SYSCONFDIR) + install -m 755 spectrwm $(DESTDIR)$(BINDIR) + install -m 755 libswmhack.so.$(LVERS) $(DESTDIR)$(LIBDIR) ++ ln -sf libswmhack.so.$(LVERS) $(DESTDIR)$(LIBDIR)/libswmhack.so.$(MVERS) ++ ln -sf libswmhack.so.$(LVERS) $(DESTDIR)$(LIBDIR)/libswmhack.so + install -m 644 ../spectrwm.1 $(DESTDIR)$(MANDIR)/man1/spectrwm.1 + install -m 644 ../spectrwm_es.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_es.1 + install -m 644 ../spectrwm_it.1 $(DESTDIR)$(MANDIR)/man1/spectrwm_it.1 diff --git a/spectrwm.spec b/spectrwm.spec new file mode 100644 index 0000000..5daa333 --- /dev/null +++ b/spectrwm.spec @@ -0,0 +1,111 @@ +Name: spectrwm +Version: 2.2.0 +Release: 9%{?dist} +Summary: Minimalist tiling window manager written in C +License: ISC + +# conf file installed to /etc +# scrotwm symlink removed +# https://opensource.conformal.com/flyspray/index.php?do=details&task_id=434 +Patch0: %{name}-%{version}-conf-file.patch +# -Wl,-soname for libswmhack.so.0 +Patch1: %{name}-%{version}-versioned-shared-lib.patch +# shlib symlinks handled in Makefile +Patch2: %{name}-%{version}-versioned-shlib-symlinks.patch +URL: https://opensource.conformal.com/wiki/%{name} +Source0: https://opensource.conformal.com/snapshots/%{name}/%{name}-%{version}.tgz +BuildRequires: xcb-util-devel +BuildRequires: xcb-util-keysyms-devel +BuildRequires: xcb-util-wm-devel +BuildRequires: libX11-devel +BuildRequires: libXcursor-devel +BuildRequires: libXft-devel +BuildRequires: libXt-devel +BuildRequires: libXrandr-devel +Requires: xterm +Requires: xlockmore +Requires: dmenu + +%description +Spectrwm is a small dynamic tiling window manager for X11. +It tries to stay out of the way so that valuable screen real +estate can be used for much more important stuff. +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 spectrwm. + +%prep +%setup -q + +%patch0 -p1 -b %{name}-%{version}-conf-file.patch +%patch1 -p1 -b %{name}-%{version}-versioned-shared-lib.patch +%patch2 -p1 -b %{name}-%{version}-versioned-shlib-symlinks.patch + +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 + +%build +make -C linux/ %{?_smp_mflags} PREFIX=/usr LIBDIR=%{_libdir} + +%install +make -C linux/ install PREFIX=/usr LIBDIR=%{_libdir} DESTDIR=%{buildroot} + +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig + +%files +%{_bindir}/%{name} +%config(noreplace) %{_sysconfdir}/%{name}.conf +%{_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 +* Tue Apr 16 2013 Lokesh Mandvekar 2.2.0-9 +- doc flag removed, not needed in this case + +* Tue Apr 16 2013 Lokesh Mandvekar 2.2.0-8 +- post and postun removed for devel package +- doc line not left empty + +* Tue Apr 16 2013 Lokesh Mandvekar 2.2.0-7 +- arch specific conditions from build and install stages removed + +* Tue Apr 16 2013 Lokesh Mandvekar 2.2.0-6 +- default programs used by spectrwm mentioned as Requires + +* Mon Apr 15 2013 Lokesh Mandvekar 2.2.0-5 +- shlib symlinks handled in upstream Makefile, not in spec + +* Sat Apr 13 2013 Lokesh Mandvekar 2.2.0-4 +- versioned shared lib patch modified + +* Fri Apr 12 2013 Lokesh Mandvekar 2.2.0-3 +- only unversioned .so file goes into devel +- url and source links don't use hardcoded package name + +* Thu Apr 11 2013 Lokesh Mandvekar 2.2.0-2 +- extra blank lines removed +- hardcoded name and version removed +- scriptlets moved below install section +- man pages are in the doc section +- added default programs used to BR (xterm,xlock,dmenu) +- versioned shared library uses -Wl,-soname and goes into devel package +- symlinks .so.0 and .so to shared library created + +* Mon Apr 01 2013 Lokesh Mandvekar 2.2.0-1 +- initial package (2.2.0)