2011-02-21 Dave Lin <[email protected]>
authordavelam
Mon, 21 Feb 2011 04:14:28 +0000
changeset 21472 6961c910bddd
parent 21463 cf7eec739260
child 21474 de0bece5623c
2011-02-21 Dave Lin <[email protected]> * specs/SUNWliblouisxml.spec * specs/SUNWliblouis.spec * specs/SUNWacroread.spec: Added 'IPS_package_name' and 'Meta(info.classification)'.
ChangeLog
specs/SUNWacroread.spec
specs/SUNWliblouis.spec
specs/SUNWliblouisxml.spec
--- a/ChangeLog	Fri Feb 18 16:36:48 2011 +0000
+++ b/ChangeLog	Mon Feb 21 04:14:28 2011 +0000
@@ -1,3 +1,10 @@
+2011-02-21  Dave Lin <[email protected]>
+
+	* specs/SUNWliblouisxml.spec
+	* specs/SUNWliblouis.spec
+	* specs/SUNWacroread.spec: Added 'IPS_package_name' and 
+	  'Meta(info.classification)'.
+
 2011-02-18  Brian Cameron  <[email protected]>
 
 	* base-specs/dbus.spec, patches/dbus-05-msg-nosignal.diff:  Bump to
--- a/specs/SUNWacroread.spec	Fri Feb 18 16:36:48 2011 +0000
+++ b/specs/SUNWacroread.spec	Mon Feb 21 04:14:28 2011 +0000
@@ -26,6 +26,8 @@
 
 
 Name:                    SUNWacroread
+IPS_package_name:        desktop/pdf-viewer/acroread
+Meta(info.classification): %{classification_prefix}:Applications/Office
 Summary:                 Acrobat Reader for PDF files
 Version:                 %{acroread.version}
 SUNW_BaseDir:            %{_basedir}
@@ -34,6 +36,7 @@
 SUNW_Copyright:          %{name}.copyright
 License:                 %{acroread.license}
 %include default-depend.inc
+%include gnome-consolidation.inc
 Requires: SUNWmfrun
 Requires: SUNWxwplt
 Requires: SUNWcslr
@@ -55,9 +58,11 @@
 
 
 %package plugin
+IPS_package_name:        desktop/pdf-viewer/acroread/plugin
 Summary:                 Acrobat Reader Plugin for Firefox
 SUNW_BaseDir:            %{_basedir}
 %include default-depend.inc
+%include gnome-consolidation.inc
 BuildRequires: SUNWfirefox
 Requires: SUNWfirefox
 Requires: SUNWacroread
@@ -300,3 +305,5 @@
 - use acroread-copyright.txt instead of default
 * Fri Aug 06 2004 - [email protected]
 - initial version
+
+
--- a/specs/SUNWliblouis.spec	Fri Feb 18 16:36:48 2011 +0000
+++ b/specs/SUNWliblouis.spec	Mon Feb 21 04:14:28 2011 +0000
@@ -9,12 +9,14 @@
 
 Summary:	   %liblouis.summary
 Name:              SUNWliblouis
+IPS_package_name:  library/liblouis
+Meta(info.classification): %{classification_prefix}:System/Libraries
 Version:           %{liblouis.version}
 SUNW_BaseDir:      %{_basedir}
 SUNW_Copyright:    %{name}.copyright
 License:           %{liblouis.license}
 BuildRoot:         %{_tmppath}/%{name}-%{liblouis.version}-build
-
+%include gnome-consolidation.inc
 %include default-depend.inc
 
 %package devel
@@ -38,7 +40,7 @@
 %install
 export PYTHON="/usr/bin/python%{pythonver}"
 %liblouis.install -d %name-%liblouis.version
-rm $RPM_BUILD_ROOT/%{_infodir}/dir
+rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
 
 # Move demo to demo directory.
 #
@@ -113,6 +115,8 @@
 %{_includedir}/liblouis/*
 
 %changelog
+* Tue Jan 04 2011 - Li Yuan <[email protected]>
+- Fix build error.
 * Mon Nov 22 2010 - Li Yuan <[email protected]>
 - Move demo to demo directory.
 * Wed Nov 03 2010 - Li Yuan <[email protected]>
--- a/specs/SUNWliblouisxml.spec	Fri Feb 18 16:36:48 2011 +0000
+++ b/specs/SUNWliblouisxml.spec	Mon Feb 21 04:14:28 2011 +0000
@@ -8,12 +8,14 @@
 
 Summary:	   %liblouisxml.summary
 Name:              SUNWliblouisxml
+IPS_package_name:  library/liblouisxml
+Meta(info.classification): %{classification_prefix}:System/Libraries
 Version:           %{liblouisxml.version}
 SUNW_BaseDir:      %{_basedir}
 SUNW_Copyright:    %{name}.copyright
 License:           %{liblouisxml.license}
 BuildRoot:         %{_tmppath}/%{name}-%{liblouisxml.version}-build
-
+%include gnome-consolidation.inc
 Requires:          SUNWliblouis
 BuildRequires:     SUNWliblouis-devel
 
@@ -38,7 +40,7 @@
 
 %install
 %liblouisxml.install -d %name-%liblouisxml.version
-rm $RPM_BUILD_ROOT/%{_infodir}/dir
+rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
 
 find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.a" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" -exec rm -f {} ';'