From 8105645f1fba5b877f5dfc7578f46eaeee42051e Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 06:50:58 +0000 Subject: auto-import kdegraphics-3.0.5a-1 from kdegraphics-3.0.5a-1.src.rpm --- diff --git a/.cvsignore b/.cvsignore index ebdf012..44fffe4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -kdegraphics-3.0.3.tar.bz2 +kdegraphics-3.0.5a.tar.bz2 libgpio-20011225.tar.bz2 diff --git a/kdegraphics.spec b/kdegraphics.spec index 4260ba8..e8f4620 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -1,50 +1,81 @@ +# gcc bug -> excludearch x86_64 +ExclusiveArch: ppc %{ix86} alpha ia64 + +%define build_release 0 +%define build_beta 1 +%define build_snapshot 2 + +%define isClean 1 + +%define isBuild %{build_release} + +%define debug 0 + +%define release_number 1 + +%define build_for_ftp 0 + %define strip_bin 0 %define final 0 %define rpm_clean 1 + +%define libtool 0 + %define desktop_file 1 %define desktop_file_utils_version 0.2.93 -%define is_release 1 -%define beta %{nil} -%define rel 5 -%define DATE 20020326 -Version: 3.0.3 -%define sourcedir stable/%{version}/distribution/tar/generic/source + +Version: 3.0.5a Name: kdegraphics -%if %{is_release} -%if "%{beta}" != "" -Release: 0.%{beta}.%{rel} -Source: ftp://ftp.kde.org/pub/kde/%{sourcedir}/%{name}-%{version}-%{beta}.tar.b -%else -Release: %{rel} -Source: ftp://ftp.kde.org/pub/kde/%{sourcedir}/%{name}-%{version}.tar.bz2 -%endif -%else -Release: 0.cvs%{DATE}.%{rel} -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 Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-buildroot License: GPL -%ifnarch s390 s390x + +%if "%{isBuild}" == "%{build_release}" +%define release_name %{nil} +Release: %{release_number} +Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/distribution/tar/generic/source/%{name}-%{version}.tar.bz2 +%endif + +%if "%{isBuild}" == "%{build_beta}" +%define release_name beta1 +Release: 0.%{release_name}.%{release_number} +Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/distribution/tar/generic/source/%{name}-%{release_name}.tar.bz2 +%endif + +%if "%{isBuild}" == "%{build_snapshot}" +%define release_name 20020807 +Release: 0.%{release_name}cvs.%{release_number} +Source: cvs://cvs.kde.org/%{name}-%{release_name}.tar.bz2 +%endif + +%if %{build_for_ftp} +ExclusiveArch: %{ix86} +%endif + +Source1: cvs://anonymous@cvs.gphoto.sourceforge.net/cvsroot/gphoto/libgpio-20011225.tar.bz2 +Source900: gccver.c + +%ifnarch s390 s390x x86_64 BuildRequires: sane-backends-devel >= 1.0.3-10 BuildRequires: gphoto2-devel %endif + BuildRequires: kdelibs-devel >= 3.0.3 BuildRequires: zlib-devel BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: imlib-devel + %if %{desktop_file} BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} %endif +Prereq: /sbin/ldconfig + %description Graphics applications for the K Desktop Environment. @@ -227,69 +258,63 @@ you wish to develop or compile applications using libkscan. %prep rm -rf $RPM_BUILD_ROOT -%if %{is_release} -%ifnarch alpha s390 s390x -%setup -q -a 1 -%else +%if "%{isBuild}" == "%{build_release}" %setup -q -%endif %else -%ifnarch alpha s390 s390x -%setup -q -n %{name} -a 1 -%else -%setup -q -n %{name} +%setup -q -n %{name}-%{version}-%{release_name} %endif + +%ifnarch alpha s390 s390x x86_64 +tar jxf %{SOURCE1} %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 +%if %{libtool} [ -x /usr/bin/autoconf-2.5? ] && ln -s /usr/bin/autoconf-2.5? autoconf [ -x /usr/bin/autoheader-2.5? ] && ln -s /usr/bin/autoheader-2.5? autoheader [ -x /usr/bin/aclocal-1.5 ] && ln -s /usr/bin/aclocal-1.5 aclocal [ -x /usr/bin/automake-1.5 ] && ln -s /usr/bin/automake-1.5 automake export PATH=`pwd`:$PATH -# End workaround - test -f Makefile.cvs && make -f Makefile.cvs +%endif %build export PATH=`pwd`:$PATH -%ifnarch alpha s390 s390x + +%ifnarch alpha s390 s390x x86_64 # Build libgpio first, we want kamera... -cd libgpio +pushd libgpio ./autogen.sh autoreconf --force --install libtoolize --copy --force -CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \ -./configure --prefix=%{_prefix} -make +CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS -fno-use-cxa-atexit" \ +./configure --prefix=%{_prefix} --libdir=%{_libdir} +make %{?_smp_mflags} make install DESTDIR=$RPM_BUILD_ROOT -cd .. +popd %endif export KDEDIR=%{_prefix} unset QTDIR || : ; . /etc/profile.d/qt.sh -CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS -fno-check-new" \ +CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS -fno-check-new -fno-use-cxa-atexit" \ ./configure \ - --prefix=%{_prefix} \ - --enable-final --includedir=/usr/include/kde \ - --with-xinerama \ -%ifnarch alpha s390 s390x - --with-kamera \ - --with-gpio-includes=$RPM_BUILD_ROOT%{_includedir}/gpio \ - --with-gpio-libraries=$RPM_BUILD_ROOT%{_libdir} + --prefix=%{_prefix} \ + --libdir=%{_libdir} \ + --enable-final \ + --includedir=/usr/include/kde \ + --with-xinerama \ +%ifnarch alpha s390 s390x x86_64 + --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} @@ -297,25 +322,18 @@ make %{?smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT -(cd $RPM_BUILD_ROOT/usr/share/doc/HTML/en +pushd $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 [ -d $i -a -L $i/common ]; then + rm -f $i/common + ln -sf ../common $i + fi +done +popd %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" \ @@ -347,7 +365,7 @@ desktop-file-install --vendor kde \ $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 +%ifnarch s390 s390x x86_64 $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/kooka.desktop \ %endif $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/kcolorchooser.desktop @@ -378,7 +396,7 @@ for i in FileBrowsing Information LookNFeel LookNFeel/Desktop LookNFeel/Themes \ fi done -%ifnarch alpha s390 s390x +%ifnarch alpha s390 s390x x86_64 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/kcontrol/applnk mv $RPM_BUILD_ROOT%{_datadir}/applnk/Settings \ $RPM_BUILD_ROOT%{_datadir}/apps/kcontrol/applnk/Preferences @@ -398,12 +416,12 @@ rm -rf $RPM_BUILD_ROOT \ %post -n libkscan -p /sbin/ldconfig %postun -n libkscan -p /sbin/ldconfig -%ifnarch alpha s390 s390x +%ifnarch alpha s390 s390x x86_64 %post -n kamera -p /sbin/ldconfig %postun -n kamera -p /sbin/ldconfig %endif -%ifnarch alpha s390 s390x +%ifnarch alpha s390 s390x x86_64 %files -n kamera %defattr(-,root,root) %{_libdir}/libgpio.so* @@ -509,7 +527,7 @@ rm -rf $RPM_BUILD_ROOT \ %{_bindir}/kiconedit %doc %{_docdir}/HTML/en/kiconedit -%ifnarch s390 s390x +%ifnarch s390 s390x x86_64 %files -n kooka %defattr(-,root,root) %{_datadir}/apps/kooka @@ -598,7 +616,7 @@ rm -rf $RPM_BUILD_ROOT \ %defattr(-,root,root) %{_includedir}/kde/kmultipageInterface.h -%ifnarch s390 s390x +%ifnarch s390 s390x x86_64 %files -n libkscan %defattr(-,root,root) %{_datadir}/icons/*/*/*/palette_color.png @@ -624,8 +642,14 @@ rm -rf $RPM_BUILD_ROOT \ %endif %changelog -* Tue Sep 24 2002 Bill Nottingham 3.0.3-4 -- fix handling of some postscript/pdf headers in kghostview +* Sun Dec 22 2002 Than Ngo 3.0.5a-1 +- update to 3.0.5a + +* Sun Nov 10 2002 Than Ngo 3.0.5-1 +- update to 3.0.5 + +* Tue Oct 15 2002 Than Ngo 3.0.4-1 +- 3.0.4 * Sun Aug 25 2002 Florian La Roche - compile on mainframe diff --git a/sources b/sources index da70e2a..8af177b 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -9c3b99cec43dccd3957158ee32573da1 kdegraphics-3.0.3.tar.bz2 +cba91964c5fcebfbe1942b58d2b1d059 kdegraphics-3.0.5a.tar.bz2 099a85087800df7af7552e3b16890916 libgpio-20011225.tar.bz2