From 0b1e03fcec7ab906e592b9011f8a1b963028f55c Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 06:52:33 +0000 Subject: auto-import changelog data from kdegraphics-3.1.95-0.1.src.rpm 3.1.95-0.1 - KDE 3.2 RC1 3.1.94-0.1 - KDE 3.2 Beta2 3.1.93-0.2 - get rid of rpath 3.1.93-0.1 - KDE 3.2 Beta1 - cleanup --- diff --git a/.cvsignore b/.cvsignore index ae09b36..884987d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kdegraphics-3.1.4.tar.bz2 +kdegraphics-3.1.95.tar.bz2 diff --git a/kdegraphics.spec b/kdegraphics.spec index 2d5eaec..5564162 100644 --- a/kdegraphics.spec +++ b/kdegraphics.spec @@ -1,14 +1,8 @@ %define debug 0 -%define strip_bin 0 %define final 0 %define rpm_clean 1 -%define desktop_file 1 -%define desktop_file_utils_version 0.2.93 - -%define monolithic 1 - # disable kpovmodeler temporary. waiting for freeglut %define kpovmodeler 0 @@ -16,8 +10,8 @@ %define no_scanner_archs s390 s390x -Version: 3.1.4 -Release: 1 +Version: 3.1.95 +Release: 0.1 Name: kdegraphics Summary: K Desktop Environment - Graphics Applications Epoch: 7 @@ -27,9 +21,6 @@ License: GPL Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2 Patch0: kde-libtool.patch -Patch1: kdegraphics-3.1.3-gcc33.patch -Patch2: kdegraphics-3.1.4-flags.patch -Patch3: kdegraphics-3.1.4-kpovmodeler.patch %ifarch %{scanner_archs} BuildRequires: sane-backends-devel >= 1.0.3-10 @@ -46,10 +37,6 @@ BuildRequires: libpng-devel BuildRequires: libtiff-devel BuildRequires: imlib-devel -%if %{desktop_file} -BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} -%endif - Requires: kdelibs >= 6:%{version} Requires: kdebase >= 6:%{version} @@ -304,9 +291,6 @@ This package contains a model editor for the PovRay raytracer. %prep %setup -q %patch0 -p1 -b .libtool -%patch1 -p1 -b .gcc33 -%patch2 -p0 -b .flags -%patch3 -p1 -b .kpovmodeler # disable kpovmodeler temporary. waiting for freeglut %if !%{kpovmodeler} @@ -331,7 +315,10 @@ unset QTDIR || : ; . /etc/profile.d/qt.sh %configure \ --with-qt-libraries=$QTDIR/lib \ + --disable-rpath \ +%if %{final} --enable-final \ +%endif --includedir=/usr/include/kde \ --with-xinerama \ %ifnarch %{no_scanner_archs} @@ -356,110 +343,6 @@ for i in *; do done popd -# move desktop files back -pushd $RPM_BUILD_ROOT%{_datadir}/applnk -for i in `find . -name "More"`; do - if /bin/ls $i/*.desktop >& /dev/null ; then - pushd $i - for j in *.desktop ; do - grep "Hidden=true" $j >& /dev/null || mv -f $j .. - done - popd - fi -done -popd - -%if ! %{kpovmodeler} -rm -rf $RPM_BUILD_ROOT%{_docdir}/HTML/en/kpovmodeler -%endif - -%if %{desktop_file} -mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications - -desktop-file-install --vendor kde \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --delete-original \ - --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 \ - --delete-original \ - --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 \ - --delete-original \ - --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 \ - --delete-original \ - --add-category "Application;Graphics;X-Red-Hat-Extra" \ - --copy-generic-name-to-name \ - $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 \ -%if "%{kpovmodeler}" == "1" - $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/kpovmodeler.desktop \ -%endif -%ifnarch %{no_scanner_archs} - $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/kooka.desktop \ -%endif - $RPM_BUILD_ROOT%{_datadir}/applnk/Graphics/kcolorchooser.desktop - -for i in Accessibility Components FileBrowsing Information LookNFeel Network \ - Peripherals Personalization PowerControl Sound WebBrowsing Security \ - Desktop LookNFeel/Desktop LookNFeel/Themes LookNFeel/Windows System; do - case $i in - Accessibility) catagory="X-KDE-Accessibility";; - FileBrowsing) catagory="X-KDE-FileBrowsing";; - Databases) catagory="X-KDE-Database";; - Desktop) catagory="X-KDE-Desktop";; - Help) catagory="X-KDE-Help";; - Information) catagory="X-KDE-Information";; - LookNFeel) catagory="X-KDE-LookNFeel";; - LookNFeel/Desktop) catagory="X-KDE-LookNFeel-Desktop";; - LookNFeel/Themes) catagory="X-KDE-LookNFeel-Theme";; - LookNFeel/Windows) catagory="X-KDE-LookNFeel-Window";; - Network) catagory="X-KDE-Network";; - Peripherals) catagory="X-KDE-Peripherals";; - Personalization) catagory="X-KDE-Personalization";; - Components) catagory="X-KDE-Components";; - Security) catagory="X-KDE-Security";; - 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 \ - --delete-original \ - --add-category "$catagory" \ - --add-only-show-in KDE \ - $RPM_BUILD_ROOT%{_datadir}/applnk/Settings/$i/*.desktop - fi -done - -%ifnarch %{no_scanner_archs} -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 - -rm -rfv $RPM_BUILD_ROOT%{_datadir}/applnk -%endif - %clean rm -rf $RPM_BUILD_ROOT @@ -471,7 +354,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc %{_docdir}/HTML/en/* %{_bindir}/* -%{_libdir}/*.so* +%{_libdir}/*.so +%{_libdir}/*.so.??* %{_libdir}/*.la %{_libdir}/kde3/* %{_datadir}/icons/*/*/*/* @@ -482,17 +366,29 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/servicetypes/* %{_datadir}/apps/* %{_datadir}/mimelnk/text/* -%if %{desktop_file} -%{_datadir}/applications/* -%else +%{_datadir}/applications/kde/* +%{_datadir}/applnk/.hidden/* %{_datadir}/applnk/* -%endif %files devel %defattr(-,root,root) %{_includedir}/kde/* +%{_libdir}/*.so.? %changelog +* Mon Jan 19 2004 Than Ngo 7:3.1.95-0.1 +- KDE 3.2 RC1 + +* Mon Dec 01 2003 Than Ngo 7:3.1.94-0.1 +- KDE 3.2 Beta2 + +* Thu Nov 27 2003 Than Ngo 7:3.1.93-0.2 +- get rid of rpath + +* Wed Nov 12 2003 Than Ngo 7:3.1.93-0.1 +- KDE 3.2 Beta1 +- cleanup + * Tue Sep 30 2003 Than Ngo 7:3.1.4-1 - 3.1.4 diff --git a/sources b/sources index 4a55646..94c4fbc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c695c8574efca207c445dcef0bb4ae43 kdegraphics-3.1.4.tar.bz2 +01d4c9769df288841cba3a0247f0fe25 kdegraphics-3.1.95.tar.bz2