From 3c8dd8254b3e445f0112de553120eb14a99964f4 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 06:50:03 +0000 Subject: auto-import kdegraphics-3.0.3-1 from kdegraphics-3.0.3-1.src.rpm --- diff --git a/kdegraphics.spec b/kdegraphics.spec index 78999c9..53800bb 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -1,10 +1,14 @@ -%define sourcedir stable/%{version}/distribution/tar/generic/source +%define strip_bin 0 +%define final 0 +%define rpm_clean 1 +%define desktop_file 1 +%define desktop_file_utils_version 0.2.93 %define is_release 1 %define beta %{nil} -%define rel 0.7.2 +%define rel 1 %define DATE 20020326 Version: 3.0.3 - +%define sourcedir stable/%{version}/distribution/tar/generic/source Name: kdegraphics %if %{is_release} %if "%{beta}" != "" @@ -20,7 +24,6 @@ Source: ftp://ftp.kde.org/pub/kde/%{sourcedir}/%{name}-%{DATE}.tar.bz2 %endif Source1: cvs://anonymous@cvs.gphoto.sourceforge.net/cvsroot/gphoto/libgpio-20011225.tar.bz2 Source900: gccver.c -Patch: kdegraphics-3.0.3-buffer2.patch Icon: kde-icon.xpm Summary: K Desktop Environment - Graphics Applications Epoch: 7 @@ -30,7 +33,16 @@ License: GPL %ifnarch s390 s390x BuildRequires: sane-backends-devel >= 1.0.3-10 %endif -BuildRequires: kdelibs-devel >= 3.0.0-0 zlib-devel libjpeg-devel libpng-devel libtiff-devel imlib-devel gphoto2-devel +BuildRequires: kdelibs-devel >= 3.0.3 +BuildRequires: zlib-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: imlib-devel +BuildRequires: gphoto2-devel +%if %{desktop_file} +BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} +%endif %description Graphics applications for the K Desktop Environment. @@ -227,11 +239,6 @@ rm -rf $RPM_BUILD_ROOT %setup -q -n %{name} %endif %endif -cd kghostview -cat dscparse.cpp | tr -d "\r" > ook -mv -f ook dscparse.cpp -cd .. -%patch -p1 -b .buffer # Workaround for legacy auto* tools [ -x /usr/bin/autoconf-2.5? ] && ln -s /usr/bin/autoconf-2.5? autoconf @@ -244,10 +251,13 @@ export PATH=`pwd`:$PATH test -f Makefile.cvs && make -f Makefile.cvs %build +export PATH=`pwd`:$PATH %ifnarch alpha # Build libgpio first, we want kamera... cd libgpio ./autogen.sh +autoreconf --force --install +libtoolize --copy --force CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \ ./configure --prefix=%{_prefix} make @@ -259,16 +269,21 @@ export KDEDIR=%{_prefix} unset QTDIR || : ; . /etc/profile.d/qt.sh CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS -fno-check-new" \ -./configure --prefix=%{_prefix} --enable-final --includedir=/usr/include/kde \ - --with-xinerama \ +./configure \ + --prefix=%{_prefix} \ + --enable-final --includedir=/usr/include/kde \ + --with-xinerama \ %ifnarch alpha - --with-kamera --with-gpio-includes=$RPM_BUILD_ROOT%{_includedir}/gpio --with-gpio-libraries=$RPM_BUILD_ROOT%{_libdir} + --with-kamera \ + --with-gpio-includes=$RPM_BUILD_ROOT%{_includedir}/gpio \ + --with-gpio-libraries=$RPM_BUILD_ROOT%{_libdir} %else - --without-kamera + --without-kamera %endif + gcc -o gccver %{SOURCE900} if [ "0`./gccver`" -lt 3001 ]; then - find . -name Makefile |xargs perl -pi -e "s,^CXXLD\s*=.*,\$& -release gcc`./gccver -v`,g" + find . -name Makefile |xargs perl -pi -e "s,^CXXLD\s*=.*,\$& -release gcc`./gccver -v`,g" fi make %{?smp_mflags} @@ -276,16 +291,100 @@ make %{?smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT -cd $RPM_BUILD_ROOT/usr/share/doc/HTML/en +(cd $RPM_BUILD_ROOT/usr/share/doc/HTML/en for i in *; do if [ -d $i -a -L $i/common ]; then rm -f $i/common ln -sf ../common $i fi +done) + +%if %{desktop_file} +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications + +for i in $(find -name "*.desktop") ; do + if grep "^Exec=kcmshell" $i >&/dev/null ; then + cp -f $i $i.than + n=$(basename ${i%.desktop}) + sed "s/^Exec=kcmshell*.*/Exec=kcmshell kde-$n/" $i.than > $i + fi done +desktop-file-install --vendor kde \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category "Application;Graphics;X-Red-Hat-Base" \ + --copy-generic-name-to-name \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/kcoloredit.desktop \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/kdvi.desktop \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/kfax.desktop + +desktop-file-install --vendor kde \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category "Application;Graphics;X-Red-Hat-Base" \ + --copy-generic-name-to-name \ + --add-only-show-in KDE \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/ksnapshot.desktop + +desktop-file-install --vendor kde \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category "Application;Graphics;X-Red-Hat-Extra" \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/kuickshow.desktop + +desktop-file-install --vendor kde \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category "Application;Graphics;X-Red-Hat-Extra" \ + --copy-generic-name-to-name \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/kcoloredit.desktop \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/kfract.desktop \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/kghostview.desktop \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/kiconedit.desktop \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/kpaint.desktop \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/kruler.desktop \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/kview.desktop \ +%ifnarch s390 s390x + $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/kooka.desktop \ +%endif + $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/kcolorchooser.desktop + +for i in FileBrowsing Information LookNFeel LookNFeel/Desktop LookNFeel/Themes \ + LookNFeel/Windows Network Peripherals Personalization \ + PowerControl Sound System WebBrowsing; do + case $i in + FileBrowsing) catagory="X-KDE-FileBrowsing";; + Databases) catagory="X-KDE-Database";; + Help) catagory="X-KDE-Help";; + Information) catagory="X-KDE-Information";; + LookNFeel) catagory="X-KDE-LookNFeel";; + Network) catagory="X-KDE-Network";; + Peripherals) catagory="X-KDE-Peripherals";; + Personalization) catagory="X-KDE-Personalization";; + PowerControl) catagory="X-KDE-PowerControl";; + Sound) catagory="X-KDE-Sound";; + System) catagory="X-KDE-System";; + WebBrowsing) catagory="X-KDE-WebBrowsing";; + esac + if /bin/ls $RPM_BUILD_ROOT%{_datadir}/applnk/Settings/$i/*.desktop >& /dev/null ; then + desktop-file-install --vendor kde \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ + --add-category "$catagory" \ + --add-only-show-in KDE \ + $RPM_BUILD_ROOT%{_datadir}/applnk/Settings/$i/*.desktop + fi +done + +%ifnarch alpha +mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/kcontrol/applnk +mv $RPM_BUILD_ROOT%{_datadir}/applnk/Settings \ + $RPM_BUILD_ROOT%{_datadir}/apps/kcontrol/applnk/Preferences +%endif +%endif + %clean -# rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/file.list.%{name} $RPM_BUILD_DIR/%{name} +%if %{rpm_clean} +rm -rf $RPM_BUILD_ROOT \ + $RPM_BUILD_DIR/file.list.%{name} \ + $RPM_BUILD_DIR/%{name} +%endif %post -n kviewshell -p /sbin/ldconfig %postun -n kviewshell -p /sbin/ldconfig @@ -296,7 +395,9 @@ done %ifnarch alpha %post -n kamera -p /sbin/ldconfig %postun -n kamera -p /sbin/ldconfig +%endif +%ifnarch alpha %files -n kamera %defattr(-,root,root) %{_libdir}/libgpio.so* @@ -306,8 +407,12 @@ done %{_libdir}/kde3/*kamera* %{_datadir}/icons/*/*/*/camera* %{_datadir}/services/kamera.protocol +%if %{desktop_file} +%{_datadir}/applications/*kamera.desktop +%else %{_datadir}/applnk/Settings/Peripherals/kamera.desktop %endif +%endif %files -n kcoloredit %defattr(-,root,root) @@ -315,15 +420,24 @@ done %{_bindir}/kcoloredit %{_bindir}/kcolorchooser %{_datadir}/icons/*/*/*/kcoloredit.png +%if %{desktop_file} +%{_datadir}/applications/*kcoloredit.desktop +%{_datadir}/applications/*kcolorchooser.desktop +%else %{_datadir}/applnk/Graphics/kcoloredit.desktop %{_datadir}/applnk/Graphics/kcolorchooser.desktop +%endif %doc %{_docdir}/HTML/en/kcoloredit %files -n kdvi %defattr(-,root,root) %{_bindir}/kdvi %{_libdir}/libkdvi* +%if %{desktop_file} +%{_datadir}/applications/*kdvi.desktop +%else %{_datadir}/applnk/Graphics/kdvi.desktop +%endif %{_datadir}/apps/kdvi %{_datadir}/icons/*/*/*/kdvi.png %doc %{_docdir}/HTML/en/kdvi @@ -333,7 +447,11 @@ done %{_bindir}/kfax %{_libdir}/libkfax*.* %{_datadir}/icons/*/*/*/kfax.png +%if %{desktop_file} +%{_datadir}/applications/*kfax.desktop +%else %{_datadir}/applnk/Graphics/kfax.desktop +%endif %{_datadir}/apps/kfax %files -n kfile-pdf @@ -352,7 +470,11 @@ done %defattr(-,root,root) %{_bindir}/kfract %{_datadir}/icons/*/*/*/kfract.png +%if %{desktop_file} +%{_datadir}/applications/*kfract.desktop +%else %{_datadir}/applnk/Graphics/kfract.desktop +%endif %{_datadir}/apps/kfract %doc %{_docdir}/HTML/en/kfract @@ -360,7 +482,11 @@ done %defattr(-,root,root) %{_datadir}/apps/kghostview %{_datadir}/icons/*/*/*/kghostview.png +%if %{desktop_file} +%{_datadir}/applications/*kghostview.desktop +%else %{_datadir}/applnk/Graphics/kghostview.desktop +%endif %{_libdir}/libkghostview*.* %{_bindir}/kghostview %doc %{_docdir}/HTML/en/kghostview @@ -369,7 +495,11 @@ done %defattr(-,root,root) %{_datadir}/apps/kiconedit %{_datadir}/icons/*/*/*/kiconedit.png +%if %{desktop_file} +%{_datadir}/applications/*kiconedit.desktop +%else %{_datadir}/applnk/Graphics/kiconedit.desktop +%endif %{_bindir}/kiconedit %doc %{_docdir}/HTML/en/kiconedit @@ -377,7 +507,11 @@ done %files -n kooka %defattr(-,root,root) %{_datadir}/apps/kooka +%if %{desktop_file} +%{_datadir}/applications/*kooka.desktop +%else %{_datadir}/applnk/Graphics/kooka.desktop +%endif %{_bindir}/kooka %doc %{_docdir}/HTML/en/kooka %endif @@ -386,7 +520,11 @@ done %defattr(-,root,root) %{_datadir}/apps/kpaint %{_datadir}/icons/*/*/*/kpaint.png +%if %{desktop_file} +%{_datadir}/applications/*kpaint.desktop +%else %{_datadir}/applnk/Graphics/kpaint.desktop +%endif %{_bindir}/kpaint %doc %{_docdir}/HTML/en/kpaint @@ -394,7 +532,11 @@ done %defattr(-,root,root) %{_datadir}/icons/*/*/*/kruler.png %{_datadir}/apps/kruler +%if %{desktop_file} +%{_datadir}/applications/*kruler.desktop +%else %{_datadir}/applnk/Graphics/kruler.desktop +%endif %{_bindir}/kruler %doc %{_docdir}/HTML/en/kruler @@ -402,7 +544,11 @@ done %defattr(-,root,root) %{_bindir}/ksnapshot %{_datadir}/icons/*/*/*/ksnapshot.png +%if %{desktop_file} +%{_datadir}/applications/*ksnapshot.desktop +%else %{_datadir}/applnk/Graphics/ksnapshot.desktop +%endif %doc %{_docdir}/HTML/en/ksnapshot %files -n kuickshow @@ -410,7 +556,11 @@ done %{_libdir}/kuickshow*.* %{_bindir}/kuickshow %{_datadir}/icons/*/*/*/kuickshow.png +%if %{desktop_file} +%{_datadir}/applications/*kuickshow.desktop +%else %{_datadir}/applnk/Graphics/kuickshow.desktop +%endif %{_datadir}/apps/kuickshow %doc %{_docdir}/HTML/en/kuickshow @@ -418,7 +568,11 @@ done %defattr(-,root,root) %{_datadir}/apps/kview %{_datadir}/icons/*/*/*/kview.png +%if %{desktop_file} +%{_datadir}/applications/*kview.desktop +%else %{_datadir}/applnk/Graphics/kview.desktop +%endif %{_libdir}/libkviewpart* %{_libdir}/kview*.* %{_bindir}/kview @@ -464,11 +618,31 @@ done %endif %changelog -* Tue Sep 24 2002 Bill Nottingham 3.0.3-0.7.1 -- fix handling of some postscript/pdf headers in kghostview - -* Wed Aug 14 2002 Bernhard Rosenkraenzer 3.0.3-1 +* Mon Aug 12 2002 Than Ngo 3.0.3-1 - 3.0.3 +- build using gcc-3.2-0.3 + +* Fri Aug 9 2002 Than Ngo 3.0.2-4 +- desktop files issues (bug #71018) + +* Tue Jul 23 2002 Tim Powers 3.0.2-3 +- build using gcc-3.2-0.1 + +* Sat Jul 20 2002 Than Ngo 3.0.2-2 +- fix desktop files issue + +* Tue Jul 09 2002 Than Ngo 3.0.2-1 +- 3.0.2 +- use desktop-file-install + +* Fri Jun 21 2002 Tim Powers +- automated rebuild + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Tue May 14 2002 Bernhard Rosenkraenzer 3.0.1-1 +- 3.0.1 * Tue Apr 16 2002 Bernhard Rosenkraenzer 3.0.0-5 - rename libraries