rpms/kdegraphics-extras/FC-6 .cvsignore, 1.4, 1.5 kdegraphics-extras.spec, 1.9, 1.10 sources, 1.4, 1.5
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Mon Aug 13 19:31:40 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdegraphics-extras/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13230
Modified Files:
.cvsignore kdegraphics-extras.spec sources
Log Message:
* Mon Aug 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-1
- 3.5.7
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics-extras/FC-6/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 2 Nov 2006 16:45:01 -0000 1.4
+++ .cvsignore 13 Aug 2007 19:31:08 -0000 1.5
@@ -1,3 +1,4 @@
kdegraphics-3.5.3.tar.bz2
kdegraphics-3.5.4.tar.bz2
kdegraphics-3.5.5.tar.bz2
+kdegraphics-3.5.7.tar.bz2
Index: kdegraphics-extras.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics-extras/FC-6/kdegraphics-extras.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kdegraphics-extras.spec 2 Nov 2006 16:45:01 -0000 1.9
+++ kdegraphics-extras.spec 13 Aug 2007 19:31:08 -0000 1.10
@@ -1,29 +1,13 @@
-# Fedora reviews:
-# core - http://bugzilla.redhat.com/195485
-# extras - http://bugzilla.redhat.com/196378
-
-# NOTE: can only build *one* of the following at a time
-# core: kdegraphics
-# extras: kdegraphics-extras
-#define core 1
-%define extras 1
-
-%if "%{?core}" == "1"
-Summary: K Desktop Environment - Graphics Applications
-Name: kdegraphics
-Epoch: 7
-%endif
+# Fedora review: extras - http://bugzilla.redhat.com/196378
-%%if "%{?extras}" == "1"
Summary: Extras for KDE graphics applications
Name: kdegraphics-extras
-%endif
-Version: 3.5.5
+Version: 3.5.7
Release: 1%{?dist}
-License: GPL
+License: GPLv2
Group: Applications/Multimedia
URL: http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdegraphics-%{version}.tar.bz2
@@ -43,67 +27,10 @@
Requires: kdelibs >= 6:%{version}
-%if "%{?core}" == "1"
-
-# kghostview
-Requires: ghostscript
-# kghostview, kpdf
-Requires: ghostscript-fonts
-%ifnarch s390 s390x
-%define kamera 1
-BuildRequires: gphoto2-devel
-%define kooka 1
-# fc5 breakage: "http://bugzilla.redhat.com/bugzilla/186511 (fixed)
-# "%{_libdir}/libsane.la contains reference(s) to missing /usr/lib/libgphoto2.la"
-BuildRequires: sane-backends-devel
-BuildRequires: libusb-devel
-# kpdf
-BuildRequires: freetype-devel
-%if "%{?fedora}" > "4"
-BuildRequires: poppler-devel
-# kgamma
-BuildRequires: libXxf86vm-devel
-%endif
-# ksvg
-BuildRequires: fontconfig-devel
-BuildRequires: fribidi-devel
-BuildRequires: lcms-devel
-BuildRequires: libart_lgpl-devel
-
-%endif
-
-Obsoletes: kolourpaint < 0:1.4.3
-Provides: kolourpaint = 0:1.4.3
-%description
-Graphics applications for the K Desktop Environment, including
-%{?kamera:* kamera (digital camera support)}
-* kcoloredit (palette editor and color chooser)
-* kdvi (displays TeX .dvi files)
-* kfax (displays faxfiles)
-* kghostview (displays postscript files)
-* kiconedit (icon editor)
-%{?kooka:* kooka (scanner application)}
-* kpdf (displays PDF files)
-* kruler (screen ruler and color measurement tool)
-* ksnapshot (screen capture utility)
-* kview (image viewer for GIF, JPEG, TIFF, etc.)
-
-%package devel
-Summary: Development files for %{name}
-Group: Development/Libraries
-Requires: kdelibs-devel
-Requires: %{name} = %{epoch}:%{version}-%{release}
-%description devel
-%{summary}.
-%endif
-
-%if "%{?extras}" == "1"
-# -extras split occured at 3.5.3-3
-Conflicts: kdegraphics < 7:3.5.3-3
%define kpovmodeler 1
%if "%{?kpovmodeler:1}" == "1"
BuildRequires: freeglut-devel
-%if "%{?fedora}" > "4"
+%if 0%{?fedora} > 4 || 0%{?rhel} > 4
BuildRequires: libXmu-devel
%endif
%endif
@@ -116,7 +43,6 @@
%{?kpovmodeler:* kpovmodler}
* kuickshow (quick picture viewer)
* OpenEXR kfile plugin
-%endif
%prep
@@ -140,9 +66,6 @@
%if "%{!?kpovmodeler:1}" == "1"
export DO_NOT_COMPILE="$DO_NOT_COMPILE kpovmodeler"
%endif
-%if "%{!?extras:1}" == "1"
-export DO_NOT_COMPILE="$DO_NOT_COMPILE kuickshow"
-%endif
%configure \
--includedir=%{_includedir}/kde \
@@ -153,37 +76,23 @@
--disable-dependency-tracking --enable-final \
%{!?kamera:--without-kamera}
-%if "%{?core}" == "1"
-make %{?_smp_mflags}
-%endif
-
-%if "%{?extras}" == "1"
make %{?_smp_mflags} -C kfile-plugins/exr
make %{?_smp_mflags} -C kuickshow
%{?kpovmodeler:make %{?_smp_mflags} -C kpovmodeler}
-%endif
%install
rm -rf $RPM_BUILD_ROOT
-%if "%{?core}" == "1"
-make install DESTDIR=$RPM_BUILD_ROOT
-# attempt to avoid possible file-conflicts
-make uninstall DESTDIR=$RPM_BUILD_ROOT -C kfile-plugins/exr ||:
-%endif
-
-%if "%{?extras}" == "1"
make install DESTDIR=$RPM_BUILD_ROOT -C kfile-plugins/exr
make install DESTDIR=$RPM_BUILD_ROOT -C kuickshow
%{?kpovmodeler:make install DESTDIR=$RPM_BUILD_ROOT -C kpovmodeler}
-%endif
# FIXME/TODO: get dfi to shut-the-hell-up about KDE's use of Keywords= and
# use of invalid characters... bah.
desktop-file-install \
- --add-category="X-Fedora" --vendor="" \
+ --vendor="" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
$RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop ||:
@@ -218,52 +127,6 @@
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
-%if "%{?core}" == "1"
-%post
-for icon_theme in crystalsvg hicolor ; do
- touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%postun
-for icon_theme in crystalsvg hicolor ; do
- touch --no-create %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
- gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-
-%files -f %{name}.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README
-%doc rpmdocs/*
-%{_bindir}/*
-%{_datadir}/applications/kde/*.desktop
-%dir %{_datadir}/applnk/Graphics
-# Not sure about this one, only contains Hidden=True.
-%{_datadir}/applnk/Graphics/*kruler.desktop
-%{_datadir}/apps/*
-%{_datadir}/icons/crystalsvg/*/*/*
-%{_datadir}/icons/hicolor/*/*/*
-%config %{_datadir}/config*/*
-%{_datadir}/service*/*
-%{_datadir}/mimelnk/*/*
-%{_libdir}/lib*.so.*
-%{_libdir}/libkfaximage.so
-%{_libdir}/libkdeinit_*.*
-%{_libdir}/kde3/*.[ls][ao]
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/kde/*
-%{_libdir}/lib*.so
-%exclude %{_libdir}/libkdeinit_*.*
-%exclude %{_libdir}/libkfaximage.so
-%endif
-
-
-%if "%{?extras}" == "1"
%post
touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
@@ -301,7 +164,6 @@
%{_datadir}/apps/kpovmodeler
%{_datadir}/icons/crystalsvg/*/*/*
%endif
-%endif
%clean
@@ -309,6 +171,9 @@
%changelog
+* Mon Aug 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 7:3.5.7-1
+- 3.5.7
+
* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 7:3.5.5-1
- 3.5.5
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdegraphics-extras/FC-6/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 2 Nov 2006 16:45:01 -0000 1.4
+++ sources 13 Aug 2007 19:31:08 -0000 1.5
@@ -1 +1 @@
-cdbe15afc01c5da7af9557e803bbb7e6 kdegraphics-3.5.5.tar.bz2
+eae753e80c5f8dd304e7fd0dca84ae67 kdegraphics-3.5.7.tar.bz2
More information about the fedora-extras-commits
mailing list