Author: glen                         Date: Sun Nov 25 12:58:47 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- updated to 2.4.6; adapterized

---- Files affected:
SPECS:
   abiword.spec (1.120.2.1.2.1.2.2 -> 1.120.2.1.2.1.2.3) 

---- Diffs:

================================================================
Index: SPECS/abiword.spec
diff -u SPECS/abiword.spec:1.120.2.1.2.1.2.2 
SPECS/abiword.spec:1.120.2.1.2.1.2.3
--- SPECS/abiword.spec:1.120.2.1.2.1.2.2        Sun Nov 25 00:43:40 2007
+++ SPECS/abiword.spec  Sun Nov 25 13:58:42 2007
@@ -8,22 +8,23 @@
 Summary:       Multi-platform word processor
 Summary(pl):   Wieloplatformowy procesor tekstu
 Name:          abiword
-Version:       2.4.5
-Release:       4
+Version:       2.4.6
+Release:       1
 Epoch:         1
 License:       GPL
 Group:         X11/Applications
 Source0:       
http://www.abisource.com/downloads/abiword/%{version}/source/%{name}-%{version}.tar.bz2
-# Source0-md5: e018669a154164d31c768f773a1c95b4
+# Source0-md5: 8ed5fb282b9741aca75b9e47500d39a1
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-home_etc.patch
 Patch2:                %{name}-mailmerge.patch
 Patch3:                %{name}-poppler05x.patch
+Patch4:                %{name}-poppler-0.6-api.patch
 URL:           http://www.abisource.com/
-BuildRequires: autoconf
-BuildRequires: automake
 BuildRequires: aiksaurus-gtk-devel >= 1.0
 BuildRequires: aspell-devel >= 0.50.0
+BuildRequires: autoconf
+BuildRequires: automake
 BuildRequires: bzip2-devel
 BuildRequires: curl-devel
 BuildRequires: enchant-devel >= 1.1.5
@@ -38,8 +39,8 @@
 BuildRequires: libgda-devel >= 1:1.2.3
 BuildRequires: libglade2-devel >= 2.0.0
 BuildRequires: libgnomedb-devel >= 1:1.2.2
-BuildRequires: libgnomeprintui-devel >= 2.2.1.3-2
 BuildRequires: libgnomeprint-devel >= 2.2.1
+BuildRequires: libgnomeprintui-devel >= 2.2.1.3-2
 BuildRequires: libgnomeui-devel >= 2.2.0
 BuildRequires: libgoffice-devel >= 0.1.0
 BuildRequires: libgsf-devel >= 1.12.1
@@ -57,6 +58,7 @@
 BuildRequires: popt-devel
 BuildRequires: psiconv-devel >= 0.9.6
 BuildRequires: wv-devel >= 1.0.3
+Requires(post,postun): desktop-file-utils
 Obsoletes:     abiword-plugin-collab
 Obsoletes:     abiword-plugin-gdkpixbuf
 Obsoletes:     abiword-plugin-gypsython
@@ -64,7 +66,6 @@
 Obsoletes:     abiword-plugin-referee
 Obsoletes:     abiword-plugins-impexp
 Obsoletes:     abiword-plugins-tools
-Requires(post,postun): desktop-file-utils
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -80,7 +81,7 @@
 %package plugin-aiksaurus
 Summary:       AbiWord Aiksaurus plugin
 Summary(pl):   Wtyczka AbiWorda Aiksaurus
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-aiksaurus
@@ -94,7 +95,7 @@
 %package plugin-babelfish
 Summary:       AbiWord Babelfish plugin
 Summary(pl):   Wtyczka AbiWorda Babelfish
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-babelfish
@@ -107,7 +108,7 @@
 %package plugin-command
 Summary:       AbiWord command line control
 Summary(pl):   Konrolowanie AbiWorda z linii polece�
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-command
@@ -120,7 +121,7 @@
 %package plugin-dash
 Summary:       AbiWord Dash plugin
 Summary(pl):   Wtyczka Dash dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-dash
@@ -133,7 +134,7 @@
 %package plugin-freetranslation
 Summary:       AbiWord freetranslation.com plugin
 Summary(pl):   Wtyczka AbiWorda dla freetranslation.com
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-freetranslation
@@ -146,7 +147,7 @@
 %package plugin-gda
 Summary:       AbiWord GDA plugin
 Summary(pl):   Wtyczka AbiWorda dla GDA
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-gda
@@ -160,7 +161,7 @@
 %package plugin-gdict
 Summary:       AbiWord gDict plugin
 Summary(pl):   Wtyczka AbiWorda gDict
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-gdict
@@ -174,7 +175,7 @@
 %package plugin-gimp
 Summary:       AbiWord image editor plugin
 Summary(pl):   Wtyczka AbiWorda dla edytor�w obrazu
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-gimp
@@ -188,12 +189,11 @@
 %package plugin-goffice
 Summary:       GNOME Office plugin
 Summary(pl):   Wtyczka GNOME Office
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-goffice
-Allows to share GNOME Office objects between GOffice
-appplications.
+Allows to share GNOME Office objects between GOffice appplications.
 
 %description plugin-goffice -l pl
 Pozwala na wsp��dzielenie obiekt�w GNOME Office pomi�dzy jego
@@ -203,7 +203,7 @@
 %package plugin-google
 Summary:       AbiWord Google plugin
 Summary(pl):   Wtyczka Google dla AbiWorda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-google
@@ -217,7 +217,7 @@
 %package plugin-mathview
 Summary:       AbiWord MathView plugin
 Summary(pl):   Wtyczka MAthView dla AbiWorda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-mathview
@@ -230,7 +230,7 @@
 %package plugin-ots
 Summary:       AbiWord OTS plugin
 Summary(pl):   Wtyczka OTS dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-ots
@@ -243,7 +243,7 @@
 %package plugin-scripthappy
 Summary:       AbiWord ScriptHappy plugin
 Summary(pl):   Wtyczka ScriptHappy dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-scripthappy
@@ -256,7 +256,7 @@
 %package plugin-urldict
 Summary:       AbiWord URLDict plugin
 Summary(pl):   Wtyczka URLDict dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-urldict
@@ -269,7 +269,7 @@
 %package plugin-wikipedia
 Summary:       AbiWord Wikipedia plugin
 Summary(pl):   Wtyczka Wikipedia dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-wikipedia
@@ -284,7 +284,7 @@
 %package plugin-applix
 Summary:       AbiWord Applix plugin
 Summary(pl):   Wtyczka Applix dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-applix
@@ -297,7 +297,7 @@
 %package plugin-bmp
 Summary:       AbiWord BMP plugin
 Summary(pl):   Wtyczka BMP dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-bmp
@@ -310,7 +310,7 @@
 %package plugin-bz2
 Summary:       AbiWord BZ2 plugin
 Summary(pl):   Wtyczka BZ2 dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-bz2
@@ -324,7 +324,7 @@
 %package plugin-clarisworks
 Summary:       AbiWord ClarisWorks plugin
 Summary(pl):   Wtyczka ClarisWorks dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-clarisworks
@@ -337,7 +337,7 @@
 %package plugin-coquille
 Summary:       AbiWord Coquille plugin
 Summary(pl):   Wtyczka Coquille dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-coquille
@@ -350,7 +350,7 @@
 %package plugin-docbook
 Summary:       AbiWord DocBook plugin
 Summary(pl):   Wtyczka DocBook dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-docbook
@@ -364,7 +364,7 @@
 %package plugin-eml
 Summary:       AbiWord EML plugin
 Summary(pl):   Wtyczka EML dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-eml
@@ -378,7 +378,7 @@
 %package plugin-hrtext
 Summary:       AbiWord HRText plugin
 Summary(pl):   Wtyczka HRText dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-hrtext
@@ -391,7 +391,7 @@
 %package plugin-hancom
 Summary:       AbiWord Hancom plugin
 Summary(pl):   Wtyczka Hancom dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-hancom
@@ -404,7 +404,7 @@
 %package plugin-iscii
 Summary:       AbiWord ISCII plugin
 Summary(pl):   Wtyczka dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-iscii
@@ -418,7 +418,7 @@
 %package plugin-jpeg
 Summary:       AbiWord JPEG plugin
 Summary(pl):   Wtyczka JPEG dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-jpeg
@@ -431,7 +431,7 @@
 %package plugin-kword
 Summary:       AbiWord KWord plugin
 Summary(pl):   Wtyczka KWord dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-kword
@@ -444,7 +444,7 @@
 %package plugin-latex
 Summary:       AbiWord LaTeX plugin
 Summary(pl):   Wtyczka LaTeX dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-latex
@@ -457,7 +457,7 @@
 %package plugin-link-grammar
 Summary:       AbiWord Link Grammar plugin
 Summary(pl):   Wtyczka Gramatyki dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-link-grammar
@@ -470,7 +470,7 @@
 %package plugin-mif
 Summary:       AbiWord MIF plugin
 Summary(pl):   Wtyczka MIF dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-mif
@@ -483,7 +483,7 @@
 %package plugin-mswrite
 Summary:       AbiWord MSWrite plugin
 Summary(pl):   Wtyczka MSWrite dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-mswrite
@@ -496,7 +496,7 @@
 %package plugin-nroff
 Summary:       AbiWord Nroff plugin
 Summary(pl):   Wtyczka Nroff dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-nroff
@@ -509,7 +509,7 @@
 %package plugin-opendocument
 Summary:       AbiWord OpenDocument plugin
 Summary(pl):   Wtyczka OpenDocument dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-opendocument
@@ -522,7 +522,7 @@
 %package plugin-openwritter
 Summary:       AbiWord OpenWriter plugin
 Summary(pl):   Wtyczka OpenWriter dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-openwritter
@@ -535,7 +535,7 @@
 %package plugin-palmdoc
 Summary:       AbiWord PalmDoc plugin
 Summary(pl):   Wtyczka PalmDoc dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-palmdoc
@@ -548,7 +548,7 @@
 %package plugin-passepartout
 Summary:       AbiWord Passepartout plugin
 Summary(pl):   Wtyczka Passepartout dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-passepartout
@@ -561,7 +561,7 @@
 %package plugin-pdf
 Summary:       AbiWord PDF plugin
 Summary(pl):   Wtyczka PDF dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-pdf
@@ -574,7 +574,7 @@
 %package plugin-psion
 Summary:       AbiWord Psion plugin
 Summary(pl):   Wtyczka Psion dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-psion
@@ -587,7 +587,7 @@
 %package plugin-rsvg
 Summary:       AbiWord RSVG plugin
 Summary(pl):   Wtyczka RSVG dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-rsvg
@@ -600,7 +600,7 @@
 %package plugin-sdw
 Summary:       AbiWord SDW plugin
 Summary(pl):   Wtyczka SDW dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-sdw
@@ -613,7 +613,7 @@
 %package plugin-t602
 Summary:       AbiWord T602 plugin
 Summary(pl):   Wtyczka T602 dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-t602
@@ -626,7 +626,7 @@
 %package plugin-wmf
 Summary:       AbiWord WMF plugin
 Summary(pl):   Wtyczka WMF dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-wmf
@@ -639,7 +639,7 @@
 %package plugin-wml
 Summary:       AbiWord WML plugin
 Summary(pl):   Wtyczka WML dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-wml
@@ -652,7 +652,7 @@
 %package plugin-wordperfect
 Summary:       AbiWord WordPerfect plugin
 Summary(pl):   Wtyczka WordPerfect dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-wordperfect
@@ -666,7 +666,7 @@
 %package plugin-xhtml
 Summary:       AbiWord XHTML plugin
 Summary(pl):   Wtyczka XHTML dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-xhtml
@@ -675,11 +675,11 @@
 %description plugin-xhtml -l pl
 Wtyczka ta s�u�y do importu plik�w HTML/wielocz��ciowego HTML.
 
-# abiXSLFO 
+# abiXSLFO
 %package plugin-xslfo
 Summary:       AbiWord XSLFO plugin
 Summary(pl):   Wtyczka XSLFO dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-xslfo
@@ -689,11 +689,11 @@
 Wtyczka ta s�u�y do importu/eksportu XSL-FO.
 
 # no one knows category
-# abiCAPI 
+# abiCAPI
 %package plugin-capi
 Summary:       AbiWord CAPI plugin
 Summary(pl):   Wtyczka CAPI dla Abiworda
-Group:         Applications/Productivity
+Group:         X11/Applications
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 
 %description plugin-capi
@@ -705,7 +705,7 @@
 %package clipart
 Summary:       AbiWord Clipart
 Summary(pl):   Cliparty dla AbiWorda
-Group:         Applications/Productivity
+Group:         X11/Applications
 
 %description clipart
 This is the clipart portfolio used by AbiWord.
@@ -719,6 +719,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p0
 
 # use generic icon name
 sed -i -e 's|abiword_48.png|abiword.png|' abi/GNUmakefile.am
@@ -734,7 +735,7 @@
        --enable-threads \
        --with-libxml2 \
        --with-pspell \
-       --with-sys-wv 
+       --with-sys-wv
 %{__make}
 
 cd ../abiword-plugins
@@ -783,7 +784,7 @@
 %{_datadir}/AbiSuite-%{mver}/AbiWord/readme.txt
 %{_libdir}/AbiWord-%{mver}/plugins/AbiWord
 
-%files plugin-aiksaurus 
+%files plugin-aiksaurus
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/AbiWord-%{mver}/plugins/libAbiAikSaurus.so
 
@@ -977,6 +978,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.120.2.1.2.1.2.3  2007-11-25 12:58:42  glen
+- updated to 2.4.6; adapterized
+
 Revision 1.120.2.1.2.1.2.2  2007-11-24 23:43:40  glen
 - rel 4
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/abiword.spec?r1=1.120.2.1.2.1.2.2&r2=1.120.2.1.2.1.2.3&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to