rpms/xforms/devel xforms.spec,1.26,1.27

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/xforms/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20802

Modified Files:
	xforms.spec 
Log Message:
* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.9.91-2
- %files: fix %defattr typo
- drop libXpm-devel from x_deps



Index: xforms.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xforms/devel/xforms.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- xforms.spec	27 Jul 2009 15:28:25 -0000	1.26
+++ xforms.spec	31 Aug 2009 12:41:37 -0000	1.27
@@ -2,7 +2,7 @@
 Name:    xforms
 Summary: XForms toolkit library
 Version: 1.0.91
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: LGPLv2+
 Group:   System Environment/Libraries
@@ -16,10 +16,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 Patch100: xforms-1.0.91-no_undefined.patch
 
 BuildRequires: libjpeg-devel
-BuildRequires: libGL-devel
-%define x_deps xorg-x11-devel
+%define x_deps xorg-x11-devel libGL-devel
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%define x_deps libX11-devel libXpm-devel
+BuildRequires: libXpm-devel
+# skip xorg-x11-proto-devel, for now, pulled in indirectly via libX11-devel
+%define x_deps libGL-devel libX11-devel
 %endif
 BuildRequires: %{x_deps}
 
@@ -40,9 +41,8 @@ can easily be created and added to the l
 %package devel
 Summary: Development files for the XForms toolkit library
 Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: %{x_deps}
-Requires: libjpeg-devel
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: %{?x_deps}
 %description devel
 %{summary}.
 
@@ -83,7 +83,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %files
-%defattr(-,root,root-)
+%defattr(-,root,root,-)
 %doc COPYING.LIB Copyright ChangeLog NEWS README
 %{_libdir}/libflimage.so.1*
 %{_libdir}/libformsGL.so.1*
@@ -100,6 +100,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Aug 31 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.9.91-2
+- %%files: fix %%defattr typo
+- drop libXpm-devel from x_deps
+
 * Mon Jul 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.0.91-1
 - xforms-1.0.91
 - nuke rpaths