[fedora-extras-commits] rpms/scribus/devel scribus.desktop, 1.2, 1.3 scribus.spec, 1.3, 1.4 scribus.xml, 1.1, 1.2

[Phillip Compton (pcompton)]

Changeset from: pcompton

Update of /cvs/extras/rpms/scribus/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv6648

Modified Files:
	scribus.spec scribus.xml 
Added Files:
	scribus.desktop 
Log Message:
Fixes to scribus to use the new mime system.



Index: scribus.desktop
===================================================================
RCS file: scribus.desktop
diff -N scribus.desktop
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ scribus.desktop	11 Nov 2004 04:05:41 -0000	1.3
@@ -0,0 +1,60 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Scribus
+Name[fa]=اسکریباس
+Name[lo]=ສະຄຣີບັດສ໌
+GenericName=Desktop Publishing
+GenericName[af]=Werkskerm Publisering
+GenericName[bg]=Издателска програма
+GenericName[bs]=Stono izdavaštvo (DTP)
+GenericName[ca]=Publicació d'escriptori
+GenericName[cs]=Publikování na desktopu
+GenericName[cy]=Cyhoeddi Penbwrdd
+GenericName[da]=Dtp
+GenericName[eo]=DTP-programo
+GenericName[es]=Publicación de escritorio
+GenericName[et]=Küljendusrakendus
+GenericName[fa]=نشر میزکار
+GenericName[fi]=Julkaisuohjelma
+GenericName[fr]=Publication de bureau
+GenericName[he]=הוצאה לאור ×©×•×œ×—× ×™×ª
+GenericName[hr]=Stolno izdavaštvo
+GenericName[hu]=Kiadványszerkesztés
+GenericName[it]=Pubblicazioni
+GenericName[ja]=デスクトップパブリッシング
+GenericName[lo]=ເດດທອບພັລບບີດຊິງ
+GenericName[lt]=Darbastalio leidykla
+GenericName[nb]=Datatrykkeprogram
+GenericName[nn]=Datatrykk
+GenericName[nso]=Kwalakwatso ya Desktop
+GenericName[pl]=Program do składu tekstu
+GenericName[pt]=Publicação no Ecrã
+GenericName[pt_BR]=Publicação do Ambiente de Trabalho
+GenericName[ru]=Настольное издательство
+GenericName[sl]=Namizno založništvo
+GenericName[sr]=Стоно издаваштво
+GenericName[ss]=Kushicelela ku desktop
+GenericName[sv]=Dáhtaprentenprográmma
+GenericName[th]=เดสก์ทอปพับลิชชิง
+GenericName[tr]=Desktop Yayıncılık
+GenericName[uk]=Видавнича система
+GenericName[uz]=Кичик нашриёт
+GenericName[ven]=U andadza Desikithopo
+GenericName[xh]=Upapasho lwe Desktop
+GenericName[zh_CN]=桌面出版
+GenericName[zh_TW]=桌面出版
+GenericName[zu]=Ukushicilelwa kwe-Desktop
+FilePattern=scribus
+TryExec=scribus
+Exec=scribus %f
+MimeType=application/x-scribus
+Terminal=false
+Icon=scribusicon.png
+Type=Application
+X-StandardInstall=false
+Categories=Qt;Office;X-Misc;
+StartupWMClass=scribus
+X-KDE-SubstituteUID=false
+X-KDE-Username=
+


Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- scribus.spec	8 Nov 2004 05:20:05 -0000	1.3
+++ scribus.spec	11 Nov 2004 04:05:41 -0000	1.4
@@ -1,38 +1,35 @@
 Name:           scribus
 Version:        1.2
-Release:        0.fdr.1.2
-Epoch:          0
+Release:        0.fdr.2
 Summary:        DeskTop Publishing app in QT.
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.scribus.net/
 Source0:        http://www.scribus.org.uk/downloads/1.2/scribus-1.2.tar.bz2
-Source1:        scribus.applications
-Source2:        scribus.keys
-Source3:        scribus.xml
-Source4:        x-scribus.desktop
-Source5:        scribus.mime
+Source1:        scribus.xml
+Source2:        scribus.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  qt-devel >= 1:3.0.5
-BuildRequires:  XFree86-devel
-BuildRequires:  zlib-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  libpng-devel
-BuildRequires:  libtiff-devel
 BuildRequires:  cups-devel
+BuildRequires:  desktop-file-utils
 BuildRequires:  lcms-devel
 BuildRequires:  libart_lgpl-devel
-BuildRequires:  openssl-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  libpng-devel
+BuildRequires:  libtiff-devel
 BuildRequires:  libtool
+BuildRequires:  openssl-devel
 BuildRequires:  python-devel >= 0:2.2
-BuildRequires:  desktop-file-utils
-Requires:       python >= 0:2.2
+BuildRequires:  qt-devel >= 1:3.0.5
+BuildRequires:  zlib-devel
 Requires:       ghostscript >= 0:7.07
+Requires:       python >= 0:2.2
 Requires:       tkinter
 Requires(post): shared-mime-info
+Requires(post): desktop-file-utils
 Requires(postun): shared-mime-info
+Requires(postun): desktop-file-utils
 
 
 %description
@@ -49,7 +46,7 @@
 %package        devel
 Summary:        Header files for Scribus.
 Group:          Development/Libraries
-Requires:       %{name} = %{epoch}:%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description    devel
 Header files for Scribus.
@@ -72,16 +69,13 @@
 
 install -p -D -m0644 scribus/icons/scribusicon.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/scribusicon.png
 install -p -D -m0644 scribus/icons/scribusdoc.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/x-scribus.png
-install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/application-registry/scribus.applications
-install -p -D -m0644 %{SOURCE2} ${RPM_BUILD_ROOT}%{_datadir}/mime-info/scribus.keys
-install -p -D -m0644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/scribus.xml
-install -p -D -m0644 %{SOURCE4} ${RPM_BUILD_ROOT}%{_datadir}/mimelnk/application/x-scribus.desktop
-install -p -D -m0644 %{SOURCE5} ${RPM_BUILD_ROOT}%{_datadir}/mime-info/scribus.mime
+install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/mime/packages/scribus.xml
+
 desktop-file-install --vendor fedora                   \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
   --add-category Application                           \
   --add-category X-Fedora                              \
-  scribus.desktop
+  %{SOURCE2}
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
 
@@ -92,25 +86,23 @@
 
 %post
 update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : 
+update-desktop-database %{_datadir}/applications
 
 
 %postun
 update-mime-database %{_datadir}/mime > /dev/null 2>&1 || : 
+update-desktop-database %{_datadir}/applications
 
 
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/scribus
-%{_libdir}/scribus/
-%{_datadir}/scribus/
-%{_datadir}/pixmaps/*
-%{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/application-registry/scribus.applications
-%{_datadir}/mime-info/scribus.keys
-%{_datadir}/mime-info/scribus.mime
+%{_datadir}/applications/fedora-scribus.desktop
 %{_datadir}/mime/packages/scribus.xml
-%{_datadir}/mimelnk/application/x-scribus.desktop
+%{_datadir}/pixmaps/*
+%{_datadir}/scribus/
+%{_libdir}/scribus/
 
 %files devel
 %defattr(-,root,root,-)
@@ -119,6 +111,10 @@
 
 
 %changelog
+* Wed Nov 10 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 1.2-0.fdr.2
+- Mime-type corrections for FC3.
+- Dropped redundent BR XFree86-devel.
+
 * Thu Aug 26 2004 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:1.2-0.fdr.1
 - 1.2.
 - Dropping old obsoletes/provides (don't know of anyone using them).


Index: scribus.xml
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/scribus.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- scribus.xml	8 Nov 2004 05:20:05 -0000	1.1
+++ scribus.xml	11 Nov 2004 04:05:41 -0000	1.2
@@ -2,6 +2,11 @@
 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
     <mime-type type="application/x-scribus">
         <comment xml:lang="en">Scribus Document</comment>
+	<comment xml:lang="pl">Dokument Scribusa</comment>
+	<comment xml:lang="de">Scribus Dokument</comment>
+	<comment xml:lang="cy">Dogfen Scribus</comment>
+	<comment xml:lang="nb">Scribus-dokument</comment>
+	<comment xml:lang="nn">Scribus-dokument</comment>
         <glob pattern="*.sla" />
         <glob pattern="*.sla.gz" />
         <glob pattern="*.scd" />