From d547f7f9282b260d9a99f860115ae6d23cbcc276 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 06:50:08 +0000 Subject: auto-import kdegraphics-3.0.3-2 from kdegraphics-3.0.3-2.src.rpm --- diff --git a/kdegraphics.spec b/kdegraphics.spec index 53800bb..ea307d7 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -5,7 +5,7 @@ %define desktop_file_utils_version 0.2.93 %define is_release 1 %define beta %{nil} -%define rel 1 +%define rel 2 %define DATE 20020326 Version: 3.0.3 %define sourcedir stable/%{version}/distribution/tar/generic/source @@ -32,6 +32,7 @@ BuildRoot: %{_tmppath}/%{name}-buildroot License: GPL %ifnarch s390 s390x BuildRequires: sane-backends-devel >= 1.0.3-10 +BuildRequires: gphoto2-devel %endif BuildRequires: kdelibs-devel >= 3.0.3 BuildRequires: zlib-devel @@ -39,7 +40,6 @@ 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 @@ -252,7 +252,7 @@ test -f Makefile.cvs && make -f Makefile.cvs %build export PATH=`pwd`:$PATH -%ifnarch alpha +%ifnarch alpha s390 s390x # Build libgpio first, we want kamera... cd libgpio ./autogen.sh @@ -273,7 +273,7 @@ CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS -fno-check-new" \ --prefix=%{_prefix} \ --enable-final --includedir=/usr/include/kde \ --with-xinerama \ -%ifnarch alpha +%ifnarch alpha s390 s390x --with-kamera \ --with-gpio-includes=$RPM_BUILD_ROOT%{_includedir}/gpio \ --with-gpio-libraries=$RPM_BUILD_ROOT%{_libdir} @@ -392,12 +392,12 @@ rm -rf $RPM_BUILD_ROOT \ %post -n libkscan -p /sbin/ldconfig %postun -n libkscan -p /sbin/ldconfig -%ifnarch alpha +%ifnarch alpha s390 s390x %post -n kamera -p /sbin/ldconfig %postun -n kamera -p /sbin/ldconfig %endif -%ifnarch alpha +%ifnarch alpha s390 s390x %files -n kamera %defattr(-,root,root) %{_libdir}/libgpio.so* @@ -407,7 +407,7 @@ rm -rf $RPM_BUILD_ROOT \ %{_libdir}/kde3/*kamera* %{_datadir}/icons/*/*/*/camera* %{_datadir}/services/kamera.protocol -%if %{desktop_file} +%if "%{desktop_file}" == "1" %{_datadir}/applications/*kamera.desktop %else %{_datadir}/applnk/Settings/Peripherals/kamera.desktop @@ -507,7 +507,7 @@ rm -rf $RPM_BUILD_ROOT \ %files -n kooka %defattr(-,root,root) %{_datadir}/apps/kooka -%if %{desktop_file} +%if "%{desktop_file}" == "1" %{_datadir}/applications/*kooka.desktop %else %{_datadir}/applnk/Graphics/kooka.desktop @@ -618,6 +618,9 @@ rm -rf $RPM_BUILD_ROOT \ %endif %changelog +* Wed Aug 14 2002 Florian La Roche +- change spec file to work for more archs + * Mon Aug 12 2002 Than Ngo 3.0.3-1 - 3.0.3 - build using gcc-3.2-0.3