[jwm: 2/2] Updated from snapshot to new release

[Germán A. Racca]

commit aee393f7c94018e4179db380be74d42115e6d9b8
Merge: 9ed2ad3 4e748b8
Author: Germán A. Racca <skytux at fedoraproject.org>
Date:   Mon Apr 9 09:28:35 2012 -0300

    Updated from snapshot to new release
    
    - Rearranged spec file

 jwm.spec |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)
---
diff --cc jwm.spec
index 8b31d9b,bc3a243..15bc7df
--- a/jwm.spec
+++ b/jwm.spec
@@@ -1,22 -1,24 +1,46 @@@
++<<<<<<< HEAD
 +Name:           jwm
 +Version:        2.1.0
 +Release:        1%{?dist}
 +Summary:        Joe's Window Manager
 +
 +Group:          User Interface/Desktops
 +License:        GPLv2+
 +URL:            http://joewing.net/programs/jwm
 +Source0:        http://joewing.net/programs/jwm/releases/%{name}-%{version}.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
++=======
+ %global revision 500
+ 
+ Name:		jwm
+ Version:	2.0.1
+ Release:	8.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
++>>>>>>> 4e748b8fef99bdd0809470f36b7fea792ba1e80e
  
  %description
  JWM is a window manager for the X11 Window System. JWM is written in C and uses
@@@ -69,9 -71,11 +93,17 @@@ rm -rf %{buildroot
  %{_mandir}/man1/%{name}.*
  
  %changelog
++<<<<<<< HEAD
 +* Mon Apr 09 2012 Germán A. Racca <skytux at fedoraproject.org> - 2.1.0-1
 +- Updated from snapshot to new release
 +- Rearranged spec file
++=======
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-8.svn500
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
+ * Tue Dec 06 2011 Adam Jackson <ajax at redhat.com> - 2.0.1-7.svn500
+ - Rebuild for new libpng
++>>>>>>> 4e748b8fef99bdd0809470f36b7fea792ba1e80e
  
  * Tue Aug 30 2011 Germán A. Racca <skytux at fedoraproject.org> 2.0.1-6.svn500
  - Added patch to remove strip from makefile