rpms/xorg-x11-twm/devel .cvsignore, 1.5, 1.6 Makefile, 1.1, 1.2 xorg-x11-twm.spec, 1.13, 1.14

Thu Jun 22 03:53:42 UTC 2006

Author: mharris

Update of /cvs/dist/rpms/xorg-x11-twm/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13854

Modified Files:
	.cvsignore Makefile xorg-x11-twm.spec 
Log Message:
* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-3
- Bump and rebuild with minor specfile cleanups.
- Add documentation to doc list, even though half of it is 0 bytes. Ah well.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-twm/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6

--- .cvsignore	31 Jan 2006 15:21:42 -0000	1.5
+++ .cvsignore	22 Jun 2006 03:53:40 -0000	1.6
@@ -1 +1,3 @@
-twm-1.0.1.tar.bz2
+*.tar.bz2
+*.tar.gz
+clog
\ No newline at end of file


Index: Makefile
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-twm/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	29 Aug 2005 06:48:46 -0000	1.1
+++ Makefile	22 Jun 2006 03:53:40 -0000	1.2
@@ -1,6 +1,6 @@
 # Makefile for source rpm: xorg-x11-twm
 # $Id$
 NAME := xorg-x11-twm
-SPECFILE = $(firstword $(wildcard *.spec))
+SPECFILE = $(NAME).spec
 
 include ../common/Makefile.common


Index: xorg-x11-twm.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-twm/devel/xorg-x11-twm.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-twm.spec	6 Jun 2006 09:25:59 -0000	1.13
+++ xorg-x11-twm.spec	22 Jun 2006 03:53:40 -0000	1.14
@@ -5,14 +5,14 @@
 # NOTE: Remove Epoch line if package gets renamed to something like "twm"
 Epoch: 1
 Version: 1.0.1
-Release: 2
+Release: 3
 License: MIT/X11
 Group: User Interface/X
 URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{pkgname}-%{version}.tar.bz2
-#Source0: %{pkgname}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Source0: http://xorg.freedesktop.org/releases/individual/lib/%{pkgname}-%{version}.tar.bz2
+
 BuildRequires: pkgconfig
 # checking TWM_LIBS... -lXmu -lXt -lSM -lICE -lXext -lX11 -ldl
 BuildRequires: libX11-devel
@@ -42,31 +42,10 @@
 X.Org X11 twm window manager
 
 %prep
-%setup -q -c %{name}-%{version}
+%setup -q -n %{pkgname}-%{version}
 
 %build
-cd %{pkgname}-%{version}
 # FIXME: Work around pointer aliasing warnings from compiler for now
-# events.c:279: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:282: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:306: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:309: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:369: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:521: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:1026: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:1270: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:1398: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:1462: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:1489: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:1846: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:2087: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:2244: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# events.c:2272: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# menus.c:521: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# menus.c:2673: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# menus.c:2857: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# parse.c:961: warning: dereferencing type-punned pointer will break strict-aliasing rules
-# resize.c:541: warning: dereferencing type-punned pointer will break strict-aliasing rules
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 %configure
 make
@@ -74,7 +53,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-cd %{pkgname}-%{version}
 make install DESTDIR=$RPM_BUILD_ROOT
 
 # FIXME: Upstream sources do not create the system wide twm config dir, nor
@@ -89,7 +67,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc AUTHORS COPYING INSTALL NEWS README ChangeLog
 %{_bindir}/twm
 #%dir %{_mandir}/man1x
 %{_mandir}/man1/twm.1x*
@@ -97,6 +75,10 @@
 %config %{_sysconfdir}/X11/twm/system.twmrc
 
 %changelog
+* Wed Jun 21 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-3
+- Bump and rebuild with minor specfile cleanups.
+- Add documentation to doc list, even though half of it is 0 bytes. Ah well.
+
 * Mon Jun 05 2006 Mike A. Harris <mharris at redhat.com> 1:1.0.1-2
 - Added "BuildRequires: pkgconfig" for (#194186)
 
@@ -117,7 +99,7 @@
 - Added "BuildRequires: libXau-devel", as twm fails without it, but does not
   check for it with ./configure.  Bug (fdo#5065)
 
-* Wed Nov 2 2005 Mike A. Harris <mharris at redhat.com> 1:0.99.1-3
+* Wed Nov 02 2005 Mike A. Harris <mharris at redhat.com> 1:0.99.1-3
 - Actually spell RPM_OPT_FLAGS correctly this time.
 
 * Mon Oct 31 2005 Mike A. Harris <mharris at redhat.com> 1:0.99.1-2
@@ -130,7 +112,7 @@
   X11R7 release number to the actual twm version.
 - Change manpage location to 'man1x' in file manifest
 
-* Wed Oct 5 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.0-2
+* Wed Oct 05 2005 Mike A. Harris <mharris at redhat.com> 6.99.99.0-2
 - Update BuildRequires to match new library naming scheme
 - Use Fedora Extras style BuildRoot declaration
 


