diff --git a/.gitignore b/.gitignore index 12b8ed7..fd01502 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ windowlab-1.34.tar -windowlab-1.37.tar diff --git a/dead.package b/dead.package deleted file mode 100644 index 7dcad86..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -This package was retired due to no active owner on 2010-08-27 diff --git a/sources b/sources new file mode 100644 index 0000000..5a91f0a --- /dev/null +++ b/sources @@ -0,0 +1 @@ +77e1552de99146a29ff405f2fdae47e4 windowlab-1.37.tar diff --git a/windowlab-1.34-pathfixes.patch b/windowlab-1.34-pathfixes.patch new file mode 100644 index 0000000..c262985 --- /dev/null +++ b/windowlab-1.34-pathfixes.patch @@ -0,0 +1,21 @@ +diff -u windowlab-1.34.old/Makefile windowlab-1.34/Makefile +--- windowlab-1.34.old/Makefile 2007-04-11 09:32:40.000000000 +1200 ++++ windowlab-1.34/Makefile 2007-04-11 09:37:42.000000000 +1200 +@@ -8,7 +8,7 @@ + PREFIX = + + # Set this to the location of the X installation you want to compile against +-XROOT = /usr/X11R6 ++XROOT = /usr + + # Set this to the location of the global configuration files + SYSCONFDIR = $(PREFIX)/etc/X11/windowlab +@@ -40,7 +40,7 @@ + endif + + BINDIR = $(DESTDIR)$(PREFIX)$(XROOT)/bin +-MANDIR = $(DESTDIR)$(PREFIX)$(XROOT)/man/man1 ++MANDIR = $(DESTDIR)$(PREFIX)$(XROOT)/share/man/man1 + CFGDIR = $(DESTDIR)$(SYSCONFDIR) + INCLUDES = -I$(XROOT)/include $(EXTRA_INC) + LDPATH = -L$(XROOT)/lib diff --git a/windowlab-1.37-nostrip.patch b/windowlab-1.37-nostrip.patch new file mode 100644 index 0000000..ed5ed01 --- /dev/null +++ b/windowlab-1.37-nostrip.patch @@ -0,0 +1,12 @@ +diff -up windowlab-1.37/Makefile.nostrip windowlab-1.37/Makefile +--- windowlab-1.37/Makefile.nostrip 2009-10-06 14:54:18.715418110 -0400 ++++ windowlab-1.37/Makefile 2009-10-06 14:54:52.434312963 -0400 +@@ -61,7 +61,7 @@ $(OBJS): %.o: %.c $(HEADERS) + $(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@ + + install: all +- mkdir -p $(BINDIR) && install -m 755 -s $(PROG) $(BINDIR) ++ mkdir -p $(BINDIR) && install -m 755 $(PROG) $(BINDIR) + mkdir -p $(MANDIR) && install -m 644 $(MANPAGE) $(MANDIR) && gzip -9vfn $(MANDIR)/$(MANPAGE) + mkdir -p $(CFGDIR) && cp -i windowlab.menurc $(CFGDIR)/windowlab.menurc && chmod 644 $(CFGDIR)/windowlab.menurc + mkdir -p $(XSESSDIR) && install -m 644 $(XSESSFILE) $(XSESSDIR) diff --git a/windowlab-1.37-xsessions.patch b/windowlab-1.37-xsessions.patch new file mode 100644 index 0000000..74ee04a --- /dev/null +++ b/windowlab-1.37-xsessions.patch @@ -0,0 +1,26 @@ +diff -up windowlab-1.37/Makefile.xsessions windowlab-1.37/Makefile +--- windowlab-1.37/Makefile.xsessions 2009-10-06 14:57:32.318292710 -0400 ++++ windowlab-1.37/Makefile 2009-10-06 14:57:59.255300192 -0400 +@@ -42,12 +42,14 @@ endif + BINDIR = $(DESTDIR)$(PREFIX)$(XROOT)/bin + MANDIR = $(DESTDIR)$(PREFIX)$(XROOT)/share/man/man1 + CFGDIR = $(DESTDIR)$(SYSCONFDIR) ++XSESSDIR = $(DESTDIR)$(PREFIX)$(XROOT)/share/xsessions + INCLUDES = -I$(XROOT)/include $(EXTRA_INC) + LDPATH = -L$(XROOT)/lib + LIBS = -lX11 $(EXTRA_LIBS) + + PROG = windowlab + MANPAGE = windowlab.1x ++XSESSFILE = windowlab.desktop + OBJS = main.o events.o client.o new.o manage.o misc.o taskbar.o menufile.o + HEADERS = windowlab.h + +@@ -63,6 +65,7 @@ install: all + mkdir -p $(BINDIR) && install -m 755 -s $(PROG) $(BINDIR) + mkdir -p $(MANDIR) && install -m 644 $(MANPAGE) $(MANDIR) && gzip -9vfn $(MANDIR)/$(MANPAGE) + mkdir -p $(CFGDIR) && cp -i windowlab.menurc $(CFGDIR)/windowlab.menurc && chmod 644 $(CFGDIR)/windowlab.menurc ++ mkdir -p $(XSESSDIR) && install -m 644 $(XSESSFILE) $(XSESSDIR) + + clean: + rm -f $(PROG) $(OBJS) diff --git a/windowlab.desktop b/windowlab.desktop new file mode 100644 index 0000000..d59e8fe --- /dev/null +++ b/windowlab.desktop @@ -0,0 +1,6 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=WindowLab +Comment=This session logs you into WindowLab +Exec=/usr/bin/windowlab + diff --git a/windowlab.spec b/windowlab.spec new file mode 100644 index 0000000..2cffaa6 --- /dev/null +++ b/windowlab.spec @@ -0,0 +1,79 @@ +Name: windowlab +Version: 1.37 +Release: 1%{?dist} +Summary: Small and Simple Amiga-like Window Manager + +Group: User Interface/Desktops +License: GPL+ +URL: http://nickgravgaard.com/windowlab/ +Source0: http://nickgravgaard.com/windowlab/windowlab-%{version}.tar +Source1: windowlab.desktop +Patch0: windowlab-1.34-pathfixes.patch +Patch1: windowlab-1.37-xsessions.patch +Patch2: windowlab-1.37-nostrip.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: libX11-devel libXext-devel + +%description +WindowLab is a Window Manager for the X Window System. Features include +click-to-focus and a simple menu/taskbar combination. WindowLab is +incredibly fast and small. + +%prep +%setup -q +cp %{SOURCE1} . +chmod a-x README TODO LICENCE CHANGELOG *.c *.h + +for i in CHANGELOG README; do + iconv -f iso-8859-1 -t utf-8 -o $i{.utf8,} + mv $i{.utf8,} +done + +%patch0 -p1 -b .pathfixes +%patch1 -p1 -b .xsessions +%patch2 -p1 -b .nostrip + +%build +CFLAGS=$RPM_OPT_FLAGS make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc CHANGELOG README TODO LICENCE +%dir %{_sysconfdir}/X11/windowlab/ +%config(noreplace) %{_sysconfdir}/X11/windowlab/windowlab.menurc +%{_bindir}/windowlab +%{_mandir}/man1/windowlab.1x.gz +%{_datadir}/xsessions/windowlab.desktop + +%changelog +* Tue Oct 6 2009 Tom "spot" Callaway - 1.37-1 +- licensing problems are resolved +- updating to 1.37 + +* Tue Feb 19 2008 Fedora Release Engineering - 1.34-5 +- Autorebuild for GCC 4.3 + +* Tue Apr 24 2007 Nigel Jones 1.34-4 +- Remove executable bit on source files + +* Wed Apr 18 2007 Nigel Jones 1.34-3 +- Honor $RPM_OPT_FLAGS +- +Patch to prevent stripping of debug info + +* Wed Apr 11 2007 Nigel Jones 1.34-2 +- Minor changes to windowlab-1.34-pathfixes.patch +- Replace files section + +* Tue Apr 10 2007 Nigel Jones 1.34-1 +- Initial SPEC file