rpms/xpaint/F-11 import.log,1.3,1.4 xpaint.spec,1.3,1.4

[Paulo Roma Cavalcanti]

Author: roma

Update of /cvs/pkgs/rpms/xpaint/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9935/F-11

Modified Files:
	import.log xpaint.spec 
Log Message:
create debug package


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xpaint/F-11/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- import.log	29 Jan 2010 15:12:55 -0000	1.3
+++ import.log	29 Jan 2010 22:01:14 -0000	1.4
@@ -1,3 +1,4 @@
 xpaint-2_8_7-1_fc10:F-11:xpaint-2.8.7-1.fc10.src.rpm:1257557234
 xpaint-2_8_7_3-1_fc10:F-11:xpaint-2.8.7.3-1.fc10.src.rpm:1260013613
 xpaint-2_8_13_1-1_fc12:F-11:xpaint-2.8.13.1-1.fc12.src.rpm:1264777943
+xpaint-2_8_13_1-3_fc12:F-11:xpaint-2.8.13.1-3.fc12.src.rpm:1264802422


Index: xpaint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpaint/F-11/xpaint.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- xpaint.spec	29 Jan 2010 15:12:55 -0000	1.3
+++ xpaint.spec	29 Jan 2010 22:01:14 -0000	1.4
@@ -1,11 +1,10 @@
 %bcond_without Xaw3d
 %bcond_with neXtaw
-%bcond_with rhel
 
 Summary:        An X Window System image editing or paint program
 Name:           xpaint
 Version:        2.8.13.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 License:        GPLv3+
 Group:          Applications/Multimedia
 URL:            http://sourceforge.net/projects/sf-xpaint
@@ -26,7 +25,11 @@ BuildRequires: libXp-devel
 %{?with_neXtaw:BuildRequires: neXtaw-devel}
 Requires: cups, gv, netpbm
 # The only way of compiling and linking plugins on the fly.
-Requires: %{name}-devel = %{version}-%{release}
+Obsoletes: %{name}-devel < %{version}-%{release}
+Provides:  %{name}-devel = %{version}-%{release}
+%if "no%{?_isa}" != "no"
+Provides: xpaint-devel%{?_isa} = %{version}-%{release}
+%endif
 
 %description
 XPaint is an X Window System color image bitmap editing program. 
@@ -41,23 +44,14 @@ and user defined procedures written as s
 The package includes a substantial list of examples and 
 some support for batch processing.
 
-%package devel
-Summary:        Development files for %{name}
-Group:          Applications/Multimedia
-%if %{without rhel}
-BuildArch:      noarch
-%endif
-# No need to require the main package, since there is no
-# library to link against.
-
-%description devel
-This package contains development files for %{name}.
-
 %prep
 %setup -q
 sed -i -e 's|/lib |/%{_lib} |g' Local.config
 sed -i -e 's|@XPMDIR@|%{_prefix}|g' Local.config
 sed -i -e 's|/usr/lib|%{_libdir}|g' configure
+sed -i -e 's|strip|#strip|g' Imakefile
+sed -i -e 's|install -c -s pdfconcat|install -c pdfconcat|g' Imakefile
+sed -i -e 's|CFLAGS="-O3 -s -DNDEBUG=1"|CFLAGS=$RPM_OPT_FLAGS|g' pdfconcat.c
 for f in ChangeLog README; do
     iconv -f iso-8859-1 -t utf-8 $f > $f.utf8
     touch -r $f $f.utf8
@@ -107,16 +101,13 @@ ln -s ../../include/%{name} %{buildroot}
 %clean
 rm -rf %{buildroot}
 
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/%{name}
-
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog GPL-3.0.txt README README.old README.PNG TODO Doc/sample.Xdefaults
 %{_bindir}/%{name}
 %{_bindir}/imgmerge
 %{_bindir}/pdfconcat
+%{_includedir}/%{name}
 %{_datadir}/X11/app-defaults/XPaint*
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/%{name}
@@ -125,6 +116,13 @@ rm -rf %{buildroot}
 
 %changelog
 
+* Fri Jan 29 2010 Paulo Roma <roma at lcg.ufrj.br> 2.8.13-3
+- Obsoleting xpaint-devel.
+
+* Fri Jan 29 2010 Paulo Roma <roma at lcg.ufrj.br> 2.8.13-2
+- Not stripping xpaint: #BUG 540223
+- Dropped devel package.
+
 * Fri Jan 29 2010 Paulo Roma <roma at lcg.ufrj.br> 2.8.13-1
 - Updated to 2.8.13.1
 - Removed emacs dependency: #BUG 542967