rpms/mcpp/devel mcpp.spec,1.10,1.11

[Kiyoshi Matsui]

Author: kmatsui

Update of /cvs/extras/rpms/mcpp/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28397

Modified Files:
	mcpp.spec 
Log Message:
Applied the bug-fixing-patch already applied for mcpp-2.7.2-4.fc13.



Index: mcpp.spec
===================================================================
RCS file: /cvs/extras/rpms/mcpp/devel/mcpp.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- mcpp.spec	12 Oct 2009 15:35:13 -0000	1.10
+++ mcpp.spec	21 Jul 2010 12:34:22 -0000	1.11
@@ -3,12 +3,14 @@
 Summary:    Alternative C/C++ preprocessor
 Name:       mcpp
 Version:    2.7.2
-Release:    3%{?dist}
+Release:    4%{?dist}
 License:    BSD
 Group:      Development/Languages
 Source:     http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 URL:        http://mcpp.sourceforge.net/
 Patch0:     mcpp-manual.html.patch
+# From http://www.zeroc.com/forums/patches/4445-patch-1-mcpp-2-7-2-a.html
+Patch1:     patch.mcpp.2.7.2.txt
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -28,6 +30,7 @@ shared library of mcpp and behaves indep
 %prep
 %setup -q
 %patch0 -p0 -b -z.euc-jp
+%patch1 -p1
 
 %build
 %configure --enable-mcpplib --disable-static
@@ -42,7 +45,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libmcpp.
 
 %files
 %defattr(-,root,root,-)
-%doc    ChangeLog ChangeLog.old LICENSE NEWS README
+%doc    ChangeLog ChangeLog.old NEWS README
 %{_datadir}/man/man1/%{name}.1.gz
 %{_bindir}/%{name}
 
@@ -56,6 +59,7 @@ This package provides a library build of
 
 %files -n libmcpp
 %defattr(-,root,root,-)
+%doc    LICENSE
 %{_libdir}/libmcpp.so.*
 
 %post -n libmcpp -p /sbin/ldconfig
@@ -86,13 +90,19 @@ This package provides an html manual for
 
 %files doc
 %defattr(-,root,root,-)
-%doc    doc/mcpp-manual.html
+%doc    LICENSE doc/mcpp-manual.html
 %lang(ja) %doc  doc-jp/mcpp-manual-jp.html
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Wed Jul 21 2010 Kiyoshi Matsui <kmatsui at t3.rim.or.jp> 2.7.2-4
+- Make subpackages to include LICENSE.
+
+* Tue Oct 13 2009 Mary Ellen Foster <mefoster at gmail.com>
+- Incorporate patch from Ice upstream project
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.7.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild