[jwm/f15] Initial import (#604971)

Germán A. Racca skytux at fedoraproject.org
Fri Sep 2 17:08:17 UTC 2011


commit 96ef5466a254f369fec1d33f39c92562e84937b2
Author: Germán A. Racca <skytux at fedoraproject.org>
Date:   Fri Sep 2 14:09:30 2011 -0300

    Initial import (#604971)

 .gitignore           |    1 +
 jwm-destdir.patch    |   24 ++++++++++++
 jwm-nostrip.patch    |   10 +++++
 jwm-timestamps.patch |   27 ++++++++++++++
 jwm.desktop          |    6 +++
 jwm.spec             |   97 ++++++++++++++++++++++++++++++++++++++++++++++++++
 sources              |    1 +
 7 files changed, 166 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..47859d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/jwm-500.tar.bz2
diff --git a/jwm-destdir.patch b/jwm-destdir.patch
new file mode 100644
index 0000000..0b3ec87
--- /dev/null
+++ b/jwm-destdir.patch
@@ -0,0 +1,24 @@
+diff -ur ../jwm-500.orig/Makefile.in ./Makefile.in
+--- ../jwm-500.orig/Makefile.in	2011-08-30 17:47:12.517158974 -0300
++++ ./Makefile.in	2011-08-30 17:48:31.003153607 -0300
+@@ -1,6 +1,6 @@
+ 
+-SYSCONF = @SYSCONF@
+-MANDIR = @MANDIR@
++SYSCONF = $(DESTDIR)@SYSCONF@
++MANDIR = $(DESTDIR)@MANDIR@
+ VERSION ?= @VERSION@
+ 
+ all:
+diff -ur ../jwm-500.orig/src/Makefile.in ./src/Makefile.in
+--- ../jwm-500.orig/src/Makefile.in	2011-08-30 17:47:12.517158974 -0300
++++ ./src/Makefile.in	2011-08-30 17:49:07.077151138 -0300
+@@ -2,7 +2,7 @@
+ CC = @CC@
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+-BINDIR = @BINDIR@
++BINDIR = $(DESTDIR)@BINDIR@
+ 
+ VPATH=.:os
+ 
diff --git a/jwm-nostrip.patch b/jwm-nostrip.patch
new file mode 100644
index 0000000..2eb363d
--- /dev/null
+++ b/jwm-nostrip.patch
@@ -0,0 +1,10 @@
+--- src/Makefile.in.orig	2011-08-30 16:26:16.463491031 -0300
++++ src/Makefile.in	2011-08-30 16:26:24.188490504 -0300
+@@ -20,7 +20,6 @@
+ all: $(EXE)
+ 
+ install: all
+-	strip $(EXE)
+ 	install -d $(BINDIR)
+ 	install $(EXE) $(BINDIR)/$(EXE)
+ 
diff --git a/jwm-timestamps.patch b/jwm-timestamps.patch
new file mode 100644
index 0000000..faa8821
--- /dev/null
+++ b/jwm-timestamps.patch
@@ -0,0 +1,27 @@
+diff -ur ../jwm-500.orig/Makefile.in ./Makefile.in
+--- ../jwm-500.orig/Makefile.in	2011-01-13 10:40:49.000000000 -0200
++++ ./Makefile.in	2011-08-30 17:46:36.402161442 -0300
+@@ -9,9 +9,9 @@
+ install: all
+ 	cd src ; $(MAKE) install ; cd ..
+ 	install -d $(SYSCONF)
+-	install -m 644 example.jwmrc $(SYSCONF)/system.jwmrc
++	install -p -m 644 example.jwmrc $(SYSCONF)/system.jwmrc
+ 	install -d $(MANDIR)/man1
+-	install -m 644 jwm.1 $(MANDIR)/man1/jwm.1
++	install -p -m 644 jwm.1 $(MANDIR)/man1/jwm.1
+ 
+ depend:
+ 	cd src ; $(MAKE) depend
+diff -ur ../jwm-500.orig/src/Makefile.in ./src/Makefile.in
+--- ../jwm-500.orig/src/Makefile.in	2011-08-30 17:45:48.211164739 -0300
++++ ./src/Makefile.in	2011-08-30 17:46:15.768162885 -0300
+@@ -21,7 +21,7 @@
+ 
+ install: all
+ 	install -d $(BINDIR)
+-	install $(EXE) $(BINDIR)/$(EXE)
++	install -p $(EXE) $(BINDIR)/$(EXE)
+ 
+ depend:
+ 	makedepend -m -DMAKE_DEPEND -- $(CFLAGS) -- *.c
diff --git a/jwm.desktop b/jwm.desktop
new file mode 100644
index 0000000..0403941
--- /dev/null
+++ b/jwm.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=JWM
+Comment=Joe's Window Manager
+Exec=jwm
+TryExec=jwm
+Type=XSession
diff --git a/jwm.spec b/jwm.spec
new file mode 100644
index 0000000..b54e0d9
--- /dev/null
+++ b/jwm.spec
@@ -0,0 +1,97 @@
+%global revision 500
+
+Name:		jwm
+Version:	2.0.1
+Release:	6.svn%{revision}%{?dist}
+Summary:	Joe's Window Manager
+
+Group:		User Interface/Desktops
+License:	GPLv2+
+URL:		http://joewing.net/programs/jwm
+Source0:	http://joewing.net/programs/jwm/snapshots/%{name}-%{revision}.tar.bz2
+Source1:	%{name}.desktop
+Patch0:		%{name}-nostrip.patch
+Patch1:		%{name}-timestamps.patch
+Patch2:		%{name}-destdir.patch
+BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:	libXext-devel libXmu-devel libXinerama-devel
+BuildRequires:	libXpm-devel libjpeg-turbo-devel libpng-devel
+BuildRequires:	libXft-devel fribidi-devel freetype-devel
+Requires:	xterm
+
+%description
+JWM is a window manager for the X11 Window System. JWM is written in C and uses
+only Xlib at a minimum. The following libraries can also be used if available:
+
+* libXext for the shape extension
+* libXext for the render extension
+* libXmu for drawing rounded windows (shape extension also needed)
+* libXinerama for Xinerama support
+* libXpm for XPM backgrounds and icons
+* libjpeg for JPEG backgrounds and icons
+* libpng for PNG backgrounds and icons
+* libxft for antialiased and true type fonts
+* libfribidi for right-to-left language support
+
+It can support some MWM, GNOME, and WM Spec hints.
+
+%prep
+%setup -q -n %{name}-%{revision}
+
+# Do not strip binary file
+%patch0 -p0 -b .orig
+
+# Preserve timestamps in installation
+%patch1 -p0 -b .orig
+
+# Enable the use of DESTDIR
+%patch2 -p0 -b .orig
+
+%build
+%configure
+make %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+mkdir -p %{buildroot}%{_datadir}/xsessions
+install -p -m 644 %{SOURCE1} %{buildroot}%{_datadir}/xsessions/
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%doc ChangeLog LICENSE README todo.txt
+%{_bindir}/%{name}
+%config(noreplace) %{_sysconfdir}/system.jwmrc
+%{_datadir}/xsessions/%{name}.desktop
+%{_mandir}/man1/%{name}.*
+
+%changelog
+* Tue Aug 30 2011 Germán A. Racca <skytux at fedoraproject.org> 2.0.1-6.svn500
+- Added patch to remove strip from makefile
+- Recreated the other patches and changed order of application
+- Removed optflags from make line
+
+* Mon Aug 22 2011 Germán A. Racca <skytux at fedoraproject.org> 2.0.1-5.svn500
+- Added optflags to the make line
+- Replaced libjpeg-devel by libjpeg-turbo-devel in BR
+- Added freetype-devel as BR
+
+* Fri Aug 19 2011 Germán A. Racca <skytux at fedoraproject.org> 2.0.1-4.svn500
+- Added xterm as requires
+- Modified release tag format
+
+* Sun Jan 09 2011 Germán A. Racca <skytux at fedoraproject.org> 2.0.1-3.20110108svn
+- Updated to snapshot 20110108
+- Removed some patches because they were fixed by upstream
+
+* Thu Jun 17 2010 German A. Racca <gracca at gmail.com> 2.0.1-2.20100616svn
+- Rebuild for Fedora 13
+- Updated to snapshot 20100616
+
+* Tue May 19 2010 German A. Racca <gracca at gmail.com> 2.0.1-1.20100503svn
+- Initial release of RPM package
diff --git a/sources b/sources
index e69de29..7f67c33 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+e046d1720c8f9fcbffd58cb6c4b0dbad  jwm-500.tar.bz2


More information about the scm-commits mailing list