Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>pull/33/head
parent
c169e89296
commit
40be1ebef7
GPG Key ID:
2A75B7CA8ADED5CF
Binary file not shown.
@ -1,11 +0,0 @@
|
||||
--- amarok-1.2/amarok/src/app.cpp-- 2005-02-15 11:43:26.600377969 +0100
|
||||
+++ amarok-1.2/amarok/src/app.cpp 2005-02-15 11:43:51.271844342 +0100
|
||||
@@ -81,7 +81,7 @@ App::App()
|
||||
// Remember old folder setup, so we can detect changes after the wizard was used
|
||||
const QStringList oldCollectionFolders = AmarokConfig::collectionFolders();
|
||||
|
||||
- if ( amaroK::config()->readBoolEntry( "First Run", true ) || args->isSet( "wizard" ) ) {
|
||||
+ if ( amaroK::config()->readBoolEntry( "First Run", false ) || args->isSet( "wizard" ) ) {
|
||||
std::cout << "STARTUP\n" << std::flush; //hide the splashscreen
|
||||
firstRunWizard();
|
||||
amaroK::config()->writeEntry( "First Run", false );
|
||||
@ -1,12 +0,0 @@
|
||||
--- amarok/src/amarokrc-- 2005-06-08 14:31:48.532241213 +0200
|
||||
+++ amarok/src/amarokrc 2005-06-08 14:32:11.076771614 +0200
|
||||
@@ -8,6 +8,9 @@ CurrentPane=ContextBrowser
|
||||
#see PlaylistWidget::setColumnWidth() for explanation for below
|
||||
ColumnWidths=0,200,100,100,0,0,0,0,0,80,0
|
||||
|
||||
+[Playback]
|
||||
+Sound System=xine-engine
|
||||
+
|
||||
[KNewStuff]
|
||||
TargetDir=amarok/themes
|
||||
Uncompress=application/x-gzip
|
||||
@ -1,22 +0,0 @@
|
||||
diff -Naur amarok-1.4.10/amarok/src/amarokrc amarok-1.4.10_yeni/amarok/src/amarokrc
|
||||
--- amarok-1.4.10/amarok/src/amarokrc 2009-12-20 01:16:09.000000000 +0200
|
||||
+++ amarok-1.4.10_yeni/amarok/src/amarokrc 2009-12-20 01:19:33.994560100 +0200
|
||||
@@ -8,6 +8,18 @@
|
||||
#see PlaylistWidget::setColumnWidth() for explanation for below
|
||||
ColumnWidths=0,200,100,100,0,0,0,0,0,80,0
|
||||
|
||||
+[Shortcuts]
|
||||
+voldn=Ctrl+Shift+KP_Subtract;XF86AudioLowerVolume
|
||||
+next=Ctrl+Shift+B;XF86AudioNext
|
||||
+osd=Ctrl+Shift+O;XF86Start
|
||||
+play_pause=Ctrl+Shift+P;XF86AudioPlay
|
||||
+prev=Ctrl+Shift+Z;XF86AudioPrev
|
||||
+stop=Ctrl+Shift+V;XF86AudioStop
|
||||
+volup=Ctrl+Shift+KP_Add;XF86AudioRaiseVolume
|
||||
+pause=Ctrl+Shift+C
|
||||
+play=Ctrl+Shift+X
|
||||
+show=Ctrl+Shift+W
|
||||
+
|
||||
[Playback]
|
||||
Sound System=xine-engine
|
||||
|
||||
@ -1,21 +0,0 @@
|
||||
--- amarok/src/filebrowser.cpp~ 2006-04-08 18:22:20.000000000 +0200
|
||||
+++ amarok/src/filebrowser.cpp 2006-04-11 13:52:36.000000000 +0200
|
||||
@@ -77,15 +77,16 @@
|
||||
// Try to keep filebrowser working even if not in a medium context
|
||||
// so if a medium object not passed in, keep earlier behavior
|
||||
if (!medium) {
|
||||
+ KGlobal::locale()->insertCatalogue("menu-messages-main");
|
||||
m_medium = 0;
|
||||
- location = new KURL( config->readPathEntry( "Location", QDir::homeDirPath() ) );
|
||||
+ location = new KURL( config->readPathEntry( "Location", QDir::homeDirPath()+"/"+i18n("Music")));
|
||||
currentFolder = new KFileItem( KFileItem::Unknown, KFileItem::Unknown, *location );
|
||||
//KIO sucks, NetAccess::exists puts up a dialog and has annoying error message boxes
|
||||
//if there is a problem so there is no point in using it anyways.
|
||||
//so... setting the diroperator to ~ is the least sucky option
|
||||
if ( !location->isLocalFile() || !currentFolder->isReadable() ) {
|
||||
delete location;
|
||||
- location = new KURL( QDir::homeDirPath() ) ;
|
||||
+ location = new KURL( QDir::homeDirPath()+"/"+i18n("Music")) ;
|
||||
}
|
||||
}
|
||||
else{
|
||||
@ -1,11 +0,0 @@
|
||||
diff -Naur amarok-1.4.10/amarok/src/amarok.desktop amarok-1.4.10_yeni/amarok/src/amarok.desktop
|
||||
--- amarok-1.4.10/amarok/src/amarok.desktop 2008-08-14 00:21:51.000000000 +0300
|
||||
+++ amarok-1.4.10_yeni/amarok/src/amarok.desktop 2009-12-20 01:01:49.987559971 +0200
|
||||
@@ -2,6 +2,7 @@
|
||||
Type=Application
|
||||
Version=0.9.4
|
||||
Encoding=UTF-8
|
||||
+InitialPreference=15
|
||||
Name=Amarok
|
||||
Name[bn]=আমারক
|
||||
Name[el]=AmaroK
|
||||
@ -1,42 +0,0 @@
|
||||
diff -Naur amarok-1.4.10/amarok/src/data/Cool-Streams.xml amarok-1.4.10_yeni/amarok/src/data/Cool-Streams.xml
|
||||
--- amarok-1.4.10/amarok/src/data/Cool-Streams.xml 2008-08-14 00:21:51.000000000 +0300
|
||||
+++ amarok-1.4.10_yeni/amarok/src/data/Cool-Streams.xml 2009-12-20 01:24:34.072559305 +0200
|
||||
@@ -9,6 +9,9 @@
|
||||
<stream name="Digital Gunfire [Industrial/EBM]">
|
||||
<url>http://www.digitalgunfire.com/playlist.pls</url>
|
||||
</stream>
|
||||
+ <stream name="Club 977 80's channel">
|
||||
+ <url>http://www.club977.com/CLUB977HI.pls</url>
|
||||
+ </stream>
|
||||
<stream name="Digitally Imported - Chillout [Chill-Out]">
|
||||
<url>http://di.fm/mp3/chillout.pls</url>
|
||||
</stream>
|
||||
@@ -18,6 +21,9 @@
|
||||
<stream name="Digitally Imported - Trance [Trance]">
|
||||
<url>http://di.fm/mp3/trance.pls</url>
|
||||
</stream>
|
||||
+ <stream name="Dogmazic [Free Music/Musique Libre]">
|
||||
+ <url>http://radio.dogmazic.net:8000/radio_mlo.ogg.m3u</url>
|
||||
+ </stream>
|
||||
<stream name="DnbRadio [Drum and Bass]">
|
||||
<url>http://dnbradio.com/hi.pls</url>
|
||||
</stream>
|
||||
@@ -69,6 +75,18 @@
|
||||
<stream name="Secret Agent [Downtempo/Lounge]">
|
||||
<url>http://somafm.com/secretagent.pls</url>
|
||||
</stream>
|
||||
+ <stream name="SkyFM [TopHits]">
|
||||
+ <url>http://www.sky.fm/mp3/tophits.pls</url>
|
||||
+ </stream>
|
||||
+ <stream name="SkyFM [80s]">
|
||||
+ <url>http://www.sky.fm/mp3/the80s.pls</url>
|
||||
+ </stream>
|
||||
+ <stream name="SkyFM [Classical music]">
|
||||
+ <url>http://www.sky.fm/mp3/classical.pls</url>
|
||||
+ </stream>
|
||||
+ <stream name="SkyFM [NewAge]">
|
||||
+ <url>http://www.sky.fm/mp3/newage.pls</url>
|
||||
+ </stream>
|
||||
<stream name="SLAY Radio [C64 Remixes]">
|
||||
<url>http://sc.slayradio.org:8000/listen.pls</url>
|
||||
</stream>
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,638 +0,0 @@
|
||||
%define libname_orig libamarok
|
||||
%define libname %mklibname kde3amarok 0
|
||||
%define develname %mklibname -d kde3amarok 0
|
||||
%define develscripts %mklibname -d kde3amarok-scripts
|
||||
|
||||
%define _disable_final 1
|
||||
|
||||
#Add MySQL support
|
||||
%define build_mysql 1
|
||||
%{?_with_mysql: %global build_mysql 1}
|
||||
|
||||
#Add PostgreSQL support
|
||||
%define build_postgresql 1
|
||||
%{?_with_postgresql: %global build_postgresql 1}
|
||||
|
||||
Summary: A powerful media player for Kde
|
||||
Name: kde3-amarok
|
||||
Version: 3.5.12
|
||||
Release: %mkrel 1
|
||||
Epoch: 1
|
||||
License: GPLv2+
|
||||
Url: http://amarok.kde.org/
|
||||
Group: Sound
|
||||
Source0: amarok-%{version}.tar.bz2
|
||||
# fwang: add lyric script for Chinese songs
|
||||
# http://www.kde-apps.org/content/show.php/Lyrics_CN?content=50120
|
||||
Source1: Lyrics_CN-0.5.3.tar.bz2
|
||||
Patch0: amarok-1.4.1-fix-initial-preference.patch
|
||||
Patch1: amarok-1.3-fix-default-config.patch
|
||||
Patch2: amarok-1.2-fix-config.patch
|
||||
Patch3: amarok-1.4-beta2-add-multimedia-shortcut.patch
|
||||
#(nl): Disable for the moment as it had been reported that this patch is broken.
|
||||
Patch4: amarok-1.4.0-use-mandriva-directory.patch
|
||||
Patch6: amarok-add-radios.patch
|
||||
#Patch8: amarok-1.4.9.1-libmtp-0.3.0-build-fix.patch
|
||||
#Patch9: wikipedia-lookup.patch
|
||||
#Patch10: amarok-1.4.10-gcc44.patch
|
||||
Patch11: kde-3.5.10-acinclude.patch
|
||||
#Patch12: fix_autotools.patch
|
||||
Patch13: fix-ifpdevice-build.patch
|
||||
Patch14: kdebase-3.5.12-move-xdg-menu-dir.patch
|
||||
Patch15: kdebase-3.5.12-config.patch
|
||||
##########################################################
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
BuildRequires: kde3-macros
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 2.63
|
||||
%else
|
||||
BuildRequires: autoconf >= 2.65
|
||||
%endif
|
||||
BuildRequires: automake >= 1.9
|
||||
BuildRequires: taglib-devel >= 1.4
|
||||
BuildRequires: kdemultimedia-devel
|
||||
BuildRequires: libxine-devel
|
||||
BuildRequires: libvisual-devel >= 0.4.0
|
||||
BuildRequires: libtunepimp-devel >= 1:0.4.2
|
||||
BuildRequires: kdebase3-devel
|
||||
BuildRequires: libxml2-utils
|
||||
BuildRequires: kde3-k3b-devel
|
||||
BuildRequires: libifp-devel
|
||||
BuildRequires: SDL-devel
|
||||
BuildRequires: libgpod-devel <= 0.7.93
|
||||
BuildRequires: libnjb-devel
|
||||
BuildRequires: sqlite3-devel
|
||||
BuildRequires: libmtp-devel >= 0.3.0
|
||||
%if %build_mysql
|
||||
BuildRequires: mysql-devel
|
||||
%endif
|
||||
%if %build_postgresql
|
||||
BuildRequires: postgresql-devel
|
||||
%endif
|
||||
BuildRequires: mesaglut-devel
|
||||
BuildRequires: libgpod-devel
|
||||
BuildRequires: ruby-devel
|
||||
BuildRequires: gpm-devel
|
||||
BuildRequires: tcl-devel
|
||||
BuildRequires: libkarma-devel
|
||||
BuildRequires: musicbrainz-devel
|
||||
Requires(post): desktop-file-utils
|
||||
Requires(postun): desktop-file-utils
|
||||
Requires: kde3-amarok-engine
|
||||
Requires: kde3-amarok-scripts
|
||||
Requires: %{libname} = %epoch:%{version}
|
||||
Requires: tunepimp-plugins
|
||||
Suggests: moodbar
|
||||
Requires: libvisual-plugins >= 0.4.0
|
||||
Suggests: transkode
|
||||
Conflicts : amarok-engine-arts
|
||||
Conflicts : amarok-engine-gstreamer
|
||||
Conflicts : amarok-engine-akode
|
||||
Conflicts : amarok-engine-gstreamer0.10
|
||||
|
||||
%description
|
||||
Feature Overview
|
||||
|
||||
* Music Collection:
|
||||
You have a huge music library and want to locate tracks quickly? Let amaroK's
|
||||
powerful Collection take care of that! It's a database powered music store,
|
||||
which keeps track of your complete music library, allowing you to find any
|
||||
title in a matter of seconds.
|
||||
|
||||
* Intuitive User Interface:
|
||||
You will be amazed to see how easy amaroK is to use! Simply drag-and-drop files
|
||||
into the playlist. No hassle with complicated buttons or tangled menus.
|
||||
Listening to music has never been easier!
|
||||
|
||||
* Streaming Radio:
|
||||
Web streams take radio to the next level: Listen to thousands of great radio
|
||||
stations on the internet, for free! amaroK provides excellent streaming
|
||||
support, with advanced features, such as displaying titles of the currently
|
||||
playing songs.
|
||||
|
||||
* Context Browser:
|
||||
This tool provides useful information on the music you are currently listening
|
||||
to, and can make listening suggestions, based on your personal music taste. An
|
||||
innovate and unique feature.
|
||||
|
||||
* Visualizations:
|
||||
amaroK is compatible with XMMS visualization plugins. Allows you to use the
|
||||
great number of stunning visualizations available on the net. 3d visualizations
|
||||
with OpenGL are a great way to enhance your music experience.
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post
|
||||
%update_menus
|
||||
%{update_desktop_database}
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun
|
||||
%clean_menus
|
||||
%{clean_desktop_database}
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc README AUTHORS COPYING ChangeLog
|
||||
%{_kde3_bindir}/*
|
||||
%{_kde3_appsdir}/konqueror/servicemenus/amarok_*
|
||||
%{_kde3_datadir}/locale/*/*/*
|
||||
%{_kde3_docdir}/*/*/amarok
|
||||
%{_kde3_datadir}/applications/kde/amarok.desktop
|
||||
%{_kde3_datadir}/servicetypes/amarok_*
|
||||
%{_kde3_datadir}/services/amarok_daap-mediadevice.desktop
|
||||
%{_kde3_datadir}/services/amarok_generic-mediadevice.desktop
|
||||
%{_kde3_datadir}/services/amarok_ifp-mediadevice.desktop
|
||||
%{_kde3_datadir}/services/amarok_ipod-mediadevice.desktop
|
||||
%{_kde3_datadir}/services/amarok_massstorage-device.desktop
|
||||
%{_kde3_datadir}/services/amarok_mtp-mediadevice.desktop
|
||||
%{_kde3_datadir}/services/amarok_nfs-device.desktop
|
||||
%{_kde3_datadir}/services/amarok_njb-mediadevice.desktop
|
||||
%{_kde3_datadir}/services/amarok_smb-device.desktop
|
||||
%{_kde3_datadir}/services/amarok_riokarma-mediadevice.desktop
|
||||
%{_kde3_datadir}/services/amarokitpc.protocol
|
||||
%{_kde3_datadir}/services/amaroklastfm.protocol
|
||||
%{_kde3_datadir}/services/amarokpcast.protocol
|
||||
%dir %{_kde3_appsdir}/amarok
|
||||
%{_kde3_appsdir}/amarok/amarokui.rc
|
||||
%dir %{_kde3_appsdir}/amarok/data
|
||||
%{_kde3_appsdir}/amarok/ruby_lib
|
||||
%{_kde3_appsdir}/amarok/themes
|
||||
%{_kde3_appsdir}/amarok/data/*
|
||||
%{_kde3_appsdir}/amarok/icons/*/*/*/*
|
||||
%{_kde3_iconsdir}/*/*/*/*
|
||||
%{_kde3_appsdir}/amarok/images/*
|
||||
%{_kde3_appsdir}/profiles/amarok.profile.xml
|
||||
%{_kde3_datadir}/config/amarokrc
|
||||
%{_kde3_datadir}/config.kcfg/amarok.kcfg
|
||||
%{_kde3_appsdir}/konqsidebartng/*
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package scripts
|
||||
Summary: Scripts for amarok
|
||||
Group: Graphical desktop/KDE3
|
||||
Requires: %name = %epoch:%version-%release
|
||||
URL: http://amarok.kde.org/
|
||||
Requires: kde3-kjsembed
|
||||
Requires: ruby
|
||||
Requires: python
|
||||
# (Anssi 05/2008) ruby_lib moved; the package was obsoleted by amarok-scripts:
|
||||
Conflicts: %{_lib}amarok0-scripts < 1:1.4.9.1-3
|
||||
|
||||
%description scripts
|
||||
This package includes python scripts for amarok.
|
||||
|
||||
%files scripts
|
||||
%defattr(-,root,root)
|
||||
%dir %{_kde3_appsdir}/amarok/scripts/
|
||||
%{_kde3_appsdir}/amarok/scripts/*
|
||||
%_kde3_libdir/ruby_lib/http11.rb
|
||||
%_kde3_libdir/ruby_lib/*.la
|
||||
%_kde3_libdir/ruby_lib/*.so.*
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package -n %{develscripts}
|
||||
Summary: Library scripts for amarok
|
||||
Group: Graphical desktop/KDE3
|
||||
Requires: %{name}-scripts = %epoch:%{version}
|
||||
URL: http://amarok.kde.org/
|
||||
Requires: ruby
|
||||
Obsoletes: %{libname}-devel-scripts
|
||||
Provides: %{libname}-devel-scripts
|
||||
|
||||
%description -n %{develscripts}
|
||||
This package includes devel for scripts for amarok.
|
||||
|
||||
%files -n %{develscripts}
|
||||
%defattr(-,root,root)
|
||||
%_kde3_libdir/ruby_lib/*.so
|
||||
|
||||
#------------------------------------------------------------------
|
||||
|
||||
%package engine-xine
|
||||
Summary: Amarok xine engine
|
||||
Group: Graphical desktop/KDE3
|
||||
Provides: kde3-amarok-engine
|
||||
URL: http://amarok.kde.org/
|
||||
Requires: xine-lib
|
||||
Requires: xine-plugins
|
||||
Requires: %name = %epoch:%version-%release
|
||||
|
||||
%description engine-xine
|
||||
This package includes xine engine for amarok.
|
||||
|
||||
%files engine-xine
|
||||
%defattr(-,root,root)
|
||||
%{_kde3_libdir}/kde3/libamarok_xine-engine.*
|
||||
%{_kde3_datadir}/services/amarok_xine-engine.desktop
|
||||
%{_kde3_datadir}/config.kcfg/xinecfg.kcfg
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package engine-yauap
|
||||
Summary: Amarok yauap engine
|
||||
Group: Graphical desktop/KDE3
|
||||
URL: http://amarok.kde.org/
|
||||
Requires: %name = %epoch:%version-%release
|
||||
Conflicts: %name < 1:1.4.8-1
|
||||
|
||||
%description engine-yauap
|
||||
This package includes yauap engine for amarok.
|
||||
|
||||
%files engine-yauap
|
||||
%defattr(-,root,root)
|
||||
%{_kde3_libdir}/kde3/libamarok_yauap-engine_plugin.*
|
||||
%{_kde3_datadir}/services/amarok_yauap-engine_plugin.desktop
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package engine-void
|
||||
Summary: Amarok void engine
|
||||
Group: Graphical desktop/KDE3
|
||||
URL: http://amarok.kde.org/
|
||||
Requires: %name = %epoch:%version-%release
|
||||
Conflicts: %name < 1:1.4.8-4
|
||||
|
||||
%description engine-void
|
||||
This package includes void engine for amarok.
|
||||
|
||||
%files engine-void
|
||||
%defattr(-,root,root)
|
||||
%{_kde3_libdir}/kde3/libamarok_void-engine_plugin.*
|
||||
%{_kde3_datadir}/services/amarok_void-engine_plugin.desktop
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package -n %{libname}
|
||||
Summary: Amarok library
|
||||
Group: Graphical desktop/KDE3
|
||||
Provides: %{libname_orig} = %epoch:%{version}-%{release}
|
||||
|
||||
%description -n %{libname}
|
||||
Library for Amarok
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n %{libname} -p /sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %{libname} -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files -n %{libname}
|
||||
%defattr(-,root,root)
|
||||
%{_kde3_libdir}/libamarok.so.*
|
||||
%{_kde3_libdir}/kde3/konqsidebar_universalamarok.*
|
||||
%{_kde3_libdir}/kde3/libamarok_daap-mediadevice.*
|
||||
%{_kde3_libdir}/kde3/libamarok_generic-mediadevice.*
|
||||
%{_kde3_libdir}/kde3/libamarok_ifp-mediadevice.*
|
||||
%{_kde3_libdir}/kde3/libamarok_ipod-mediadevice.*
|
||||
%{_kde3_libdir}/kde3/libamarok_massstorage-device.*
|
||||
%{_kde3_libdir}/kde3/libamarok_mtp-mediadevice.*
|
||||
%{_kde3_libdir}/kde3/libamarok_nfs-device.*
|
||||
%{_kde3_libdir}/kde3/libamarok_njb-mediadevice.*
|
||||
%{_kde3_libdir}/kde3/libamarok_smb-device.*
|
||||
%{_kde3_libdir}/kde3/libamarok_riokarma-mediadevice.*
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package -n %{develname}
|
||||
Summary: Headers of %name for development
|
||||
Group: Development/C
|
||||
Requires: %{libname} = %epoch:%{version}
|
||||
Provides: %{name}-devel = %epoch:%{version}-%{release}
|
||||
Provides: amarok0-devel = %epoch:%{version}-%{release}
|
||||
# (Anssi 05/2008) Wrong package name:
|
||||
Conflicts: %{_lib}amarok-devel < 1:1.4.9.1-3
|
||||
|
||||
%description -n %{develname}
|
||||
Headers of %{name} for development.
|
||||
|
||||
%files -n %{develname}
|
||||
%defattr(-,root,root)
|
||||
%{_kde3_libdir}/libamarok.la
|
||||
%{_kde3_libdir}/libamarok.so
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q -n amarok-%version -a 1
|
||||
%patch0 -p1 -b .fix_amarok_initial_preference
|
||||
%patch1 -p0 -b .fix_amarok_default_config_file
|
||||
%patch3 -p1 -b .fix_add_multimedia_shortcut
|
||||
%patch6 -p1 -b .add_some_radios
|
||||
#%patch8 -p0
|
||||
#%patch9 -p1
|
||||
#%patch10 -p1
|
||||
%if %mdkversion >= 201000
|
||||
%patch11 -p1
|
||||
#%patch12 -p1
|
||||
%patch13 -p1
|
||||
%endif
|
||||
%patch14 -p0
|
||||
%patch15 -p0
|
||||
|
||||
%build
|
||||
PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
|
||||
export xdg_menudir=%_sysconfdir/xdg/kde/menus
|
||||
|
||||
make -f admin/Makefile.common cvs
|
||||
export QTDIR=%qt3dir
|
||||
|
||||
%configure_kde3 --docdir=%_kde3_docdir\
|
||||
--with-xine \
|
||||
--with-yauap \
|
||||
--without-included-sqlite \
|
||||
--with-libgpod \
|
||||
--without-helix \
|
||||
--without-xmms \
|
||||
--with-libmtp \
|
||||
--with-libkarma \
|
||||
--with-ifp \
|
||||
%if %build_mysql
|
||||
--enable-mysql \
|
||||
%endif
|
||||
%if %build_postgresql
|
||||
--enable-postgresql \
|
||||
%endif
|
||||
|
||||
%make
|
||||
|
||||
%install
|
||||
rm -rf %buildroot
|
||||
|
||||
%{makeinstall_std}
|
||||
|
||||
# install source1
|
||||
mkdir -p %{buildroot}/%{_kde3_appsdir}/amarok/scripts/lyrics_cn/dict
|
||||
pushd Lyrics_CN
|
||||
cp -a * %{buildroot}/%{_kde3_appsdir}/amarok/scripts/lyrics_cn
|
||||
find %{buildroot}/%{_kde3_appsdir}/amarok/scripts/lyrics_cn/ -type f | xargs chmod 0644
|
||||
chmod 0755 %{buildroot}/%{_kde3_appsdir}/amarok/scripts/lyrics_cn/Lyrics_CN
|
||||
popd
|
||||
|
||||
#correct wrong script encoding file
|
||||
perl -pi -e 's/\015$//' %{buildroot}/%{_kde3_appsdir}/amarok/data/Cool-Streams.xml
|
||||
perl -pi -e 's/\015$//' %{buildroot}/%{_kde3_appsdir}/amarok/scripts/playlist2html/README
|
||||
perl -pi -e 's/\015$//' %{buildroot}/%{_kde3_appsdir}/amarok/scripts/webcontrol/README
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf %buildroot
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
|
||||
* Mon Jul 25 2011 Tim Williams <tim@my-place.org.uk> 3.5.12-1mvt2010.2
|
||||
+ Update to Trinity sources
|
||||
- Remove amarok-1.4.10-gcc44.patch, fix_autotools.patch, amarok-1.4.9.1-fix-underlinking.patch, amarok-1.4.9.1-libmtp-0.3.0-build-fix.patch
|
||||
+ Add kdebase-3.5.12-move-xdg-menu-dir.patch, kdebase-3.5.12-config.patch
|
||||
- Remove wikipedia-lookup.patch
|
||||
|
||||
* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 1:1.4.10-5mvt2010.1
|
||||
+ Rebuild for MDV 2010.1
|
||||
+ change required version of libgpod to match MDV 2010.1 packages
|
||||
|
||||
* Wed Dec 23 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:1.4.10-4mvt2010.0
|
||||
- Use upper release number to avoid unwanted KDE4 upgrade
|
||||
- Fix automake 1.11 and autoconf 2.65 build issues
|
||||
- Fix ifp build for compability autoconf changes
|
||||
- Change package group
|
||||
|
||||
* Sun Dec 20 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:1.4.10-3mvt2010.0
|
||||
+ Last KDE3 verison
|
||||
+ Built for 2010.0 release
|
||||
+ Added gcc4 patch
|
||||
+ Fix wikipedia lookup patch
|
||||
+ Fix karma service built
|
||||
|
||||
* Tue Sep 02 2008 Helio Chissini de Castro <helio@mandriva.com> 1:1.4.10-2mdv2009.0
|
||||
+ Revision: 278767
|
||||
- Fix kjsembed and k3b-devel requires
|
||||
|
||||
* Thu Aug 14 2008 Funda Wang <fundawang@mandriva.org> 1:1.4.10-1mdv2009.0
|
||||
+ Revision: 271697
|
||||
- New version 1.4.10
|
||||
|
||||
* Fri Jul 18 2008 Funda Wang <fundawang@mandriva.org> 1:1.4.9.1-9mdv2009.0
|
||||
+ Revision: 238331
|
||||
- add patch to build against libmtp 0.3.0
|
||||
|
||||
* Thu Jul 03 2008 Adam Williamson <awilliamson@mandriva.com> 1:1.4.9.1-8mdv2009.0
|
||||
+ Revision: 231371
|
||||
- drop exscalibar (build)requires: moodbar was rewritten not to need exscalibar
|
||||
in august 2006
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
|
||||
|
||||
* Wed Jun 11 2008 Funda Wang <fundawang@mandriva.org> 1:1.4.9.1-7mdv2009.0
|
||||
+ Revision: 218132
|
||||
- add patch to fix underlink
|
||||
- rebuild for new configure_kde3
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
|
||||
|
||||
* Wed Jun 04 2008 Funda Wang <fundawang@mandriva.org> 1:1.4.9.1-6mdv2009.0
|
||||
+ Revision: 214923
|
||||
- BR tcl
|
||||
- rebuild for new directfb
|
||||
|
||||
* Tue May 20 2008 Anssi Hannula <anssi@mandriva.org> 1:1.4.9.1-5mdv2009.0
|
||||
+ Revision: 209512
|
||||
- change the libamarok0-scripts obsoletes back to conflict to avoid
|
||||
multiple packages obsoleting the same one
|
||||
- do not require kde3-amarok in libamarok0 (avoids upgrading users
|
||||
getting both kde3-amarok and amarok)
|
||||
|
||||
+ Funda Wang <fundawang@mandriva.org>
|
||||
- libscripts should be obsoleted rather than conflicts
|
||||
|
||||
* Tue May 13 2008 Anssi Hannula <anssi@mandriva.org> 1:1.4.9.1-3mdv2009.0
|
||||
+ Revision: 206809
|
||||
- rename libamarok-devel to libamarok0-devel to avoid conflicts with
|
||||
main amarok package
|
||||
- drop libamarok0-scripts and move the contents to amarok-scripts
|
||||
|
||||
* Mon May 12 2008 Anssi Hannula <anssi@mandriva.org> 1:1.4.9.1-2mdv2009.0
|
||||
+ Revision: 206473
|
||||
- drop obsoletes that belong to amarok package
|
||||
- do not provide libamarok-devel, it conflicts with main amarok devel pkg
|
||||
|
||||
+ Funda Wang <fundawang@mandriva.org>
|
||||
- should be kde3-k3b
|
||||
|
||||
* Fri May 09 2008 Funda Wang <fundawang@mandriva.org> 1:1.4.9.1-1mdv2009.0
|
||||
+ Revision: 204803
|
||||
- New version of lyrics_cn plugin
|
||||
- New version 1.4.9.1
|
||||
|
||||
* Fri May 09 2008 Helio Chissini de Castro <helio@mandriva.com> 1:1.4.8-11mdv2009.0
|
||||
+ Revision: 204753
|
||||
- Return of kde3 amarok in new /opt path
|
||||
- We need old amarok for kde3
|
||||
|
||||
* Sat Mar 08 2008 Funda Wang <fundawang@mandriva.org> 1:1.4.8-8mdv2008.1
|
||||
+ Revision: 182085
|
||||
- New license policy
|
||||
- fix lyrics_cn file permission
|
||||
|
||||
* Tue Mar 04 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.8-7mdv2008.1
|
||||
+ Revision: 179228
|
||||
- Add support for the new amazon web API
|
||||
- Remove condition for unsupported version
|
||||
|
||||
* Thu Feb 28 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.8-6mdv2008.1
|
||||
+ Revision: 176529
|
||||
- Add transkode as suggest as requested by colin
|
||||
|
||||
* Thu Feb 21 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.8-5mdv2008.1
|
||||
+ Revision: 173486
|
||||
- Only provide amarok-engine on working engines (Bug #37800)
|
||||
- Package void engine in its own package (Bug #37797)
|
||||
|
||||
* Sun Feb 10 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.8-3mdv2008.1
|
||||
+ Revision: 164737
|
||||
- [FEATURE] Enable mysql and postgresql support (Bug #36392)
|
||||
Add upstream patch to fix some pbs on the dynamic mode
|
||||
- Move yauap in its own engine package
|
||||
|
||||
* Thu Dec 20 2007 Olivier Blin <oblin@mandriva.com> 1:1.4.8-1mdv2008.1
|
||||
+ Revision: 135819
|
||||
- restore BuildRoot
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- New version 1.4.8
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
|
||||
* Wed Nov 14 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-14mdv2008.1
|
||||
+ Revision: 108663
|
||||
- rebuild for new libgpod
|
||||
|
||||
* Wed Oct 31 2007 Thierry Vignaud <tvignaud@mandriva.com> 1:1.4.7-12mdv2008.1
|
||||
+ Revision: 104176
|
||||
- really rebuild for new libmtp
|
||||
|
||||
* Sun Oct 28 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-11mdv2008.1
|
||||
+ Revision: 102710
|
||||
- fix startup of lyrics_CN script
|
||||
|
||||
* Sat Oct 27 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-10mdv2008.1
|
||||
+ Revision: 102620
|
||||
- Rebuild for new libmtp
|
||||
- New version of Lyrics_CN plugin
|
||||
- suggests moodbar
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- Add patch from upstream stable branch (patch 16)
|
||||
Add support for other engines and hardware (WIP)
|
||||
|
||||
* Mon Sep 03 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-9mdv2008.0
|
||||
+ Revision: 78441
|
||||
- New version of Lyrics_CN plugin
|
||||
|
||||
* Fri Aug 31 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.7-8mdv2008.0
|
||||
+ Revision: 76978
|
||||
- Add upstream patch: amarok freezes when trying to play mp3 files without mp3 support
|
||||
- Add upstream patch that fix a crash with mysql
|
||||
- Fix post/postun
|
||||
- Add new upstream patches from BRANCH
|
||||
|
||||
* Mon Aug 27 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1:1.4.7-7mdv2008.0
|
||||
+ Revision: 72238
|
||||
- Rebuild for locale dir fix
|
||||
|
||||
* Sun Aug 26 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.7-6mdv2008.0
|
||||
+ Revision: 71488
|
||||
- Add upstream patches from upcoming 1.4.8 release
|
||||
|
||||
* Sat Aug 25 2007 Anssi Hannula <anssi@mandriva.org> 1:1.4.7-5mdv2008.0
|
||||
+ Revision: 71349
|
||||
- rebuild with new rpm-mandriva-setup for find_lang fixes
|
||||
|
||||
* Fri Aug 24 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-4mdv2008.0
|
||||
+ Revision: 70748
|
||||
- fix install of lyric_cn script
|
||||
- New version of Lyrics_CN
|
||||
|
||||
* Sat Aug 18 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-3mdv2008.0
|
||||
+ Revision: 65550
|
||||
- New devel policy for scripts-devel
|
||||
|
||||
* Sat Aug 18 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-2mdv2008.0
|
||||
+ Revision: 65423
|
||||
- New devel package policy
|
||||
|
||||
* Thu Aug 16 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.7-1mdv2008.0
|
||||
+ Revision: 64501
|
||||
- New verison 1.4.7
|
||||
|
||||
* Fri Aug 10 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.6-5mdv2008.0
|
||||
+ Revision: 61071
|
||||
- finally fix lyric_cn permission
|
||||
|
||||
* Sun Aug 05 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.6-4mdv2008.0
|
||||
+ Revision: 59036
|
||||
- Rebuild against latest libmtp
|
||||
|
||||
* Wed Jun 27 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.6-3mdv2008.0
|
||||
+ Revision: 44942
|
||||
- Rebuild against k3b 1.0.2
|
||||
- fix permission
|
||||
|
||||
* Fri Jun 22 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.6-2mdv2008.0
|
||||
+ Revision: 42938
|
||||
- Renew SOURCE1
|
||||
fix executive permission
|
||||
|
||||
* Wed Jun 20 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.6-1mdv2008.0
|
||||
+ Revision: 41932
|
||||
- Remove desktop-file-utils require as categories have been merged upstream
|
||||
|
||||
+ Funda Wang <fundawang@mandriva.org>
|
||||
- Kill patch21, merged upstream
|
||||
- kill patch 7, merged upstream
|
||||
- New upstream version
|
||||
|
||||
* Wed Jun 13 2007 Tomasz Pawel Gajc <tpg@mandriva.org> 1:1.4.5-15mdv2008.0
|
||||
+ Revision: 38603
|
||||
- rebuild for expat
|
||||
|
||||
* Fri Jun 01 2007 Herton Ronaldo Krzesinski <herton@mandriva.com.br> 1:1.4.5-14mdv2008.0
|
||||
+ Revision: 34341
|
||||
- Rebuild with libslang2.
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
-Add only needed categories
|
||||
|
||||
* Sat May 26 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.5-13mdv2008.0
|
||||
+ Revision: 31411
|
||||
- Rebuild for directfb 1.0
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- Add patch21 from upstream (rev: 667738 )
|
||||
|
||||
* Wed May 09 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.5-12mdv2008.0
|
||||
+ Revision: 25817
|
||||
- Rebuild
|
||||
- Fix breakage because of wrongly removed macros
|
||||
|
||||
+ Funda Wang <fundawang@mandriva.org>
|
||||
- install with correct permission
|
||||
|
||||
* Sat May 05 2007 Funda Wang <fundawang@mandriva.org> 1:1.4.5-10mdv2008.0
|
||||
+ Revision: 22912
|
||||
- Added lyrics_cn script for Chinese songs.
|
||||
|
||||
* Mon Apr 16 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:1.4.5-9mdv2008.0
|
||||
+ Revision: 13504
|
||||
- Bump release
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -ur k3b-1.0.4.orig/libk3b/projects/datacd/k3bisooptions.cpp k3b-1.0.4/libk3b/projects/datacd/k3bisooptions.cpp
|
||||
--- k3b-1.0.4.orig/libk3b/projects/datacd/k3bisooptions.cpp 2007-11-02 11:55:40.000000000 +0200
|
||||
+++ k3b-1.0.4/libk3b/projects/datacd/k3bisooptions.cpp 2008-01-04 15:56:28.000000000 +0200
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
m_doNotCacheInodes = true;
|
||||
|
||||
- m_isoLevel = 2;
|
||||
+ m_isoLevel = 3;
|
||||
|
||||
m_discardSymlinks = false;
|
||||
m_discardBrokenSymlinks = false;
|
||||
@ -1,233 +0,0 @@
|
||||
%define major 3
|
||||
%define libname %mklibname k3b %major
|
||||
%define oldlibname %mklibname k3b 2
|
||||
|
||||
%define k3b_18n_version 1.0.5
|
||||
|
||||
Name: kde3-k3b
|
||||
Summary: CD-Burner for KDE
|
||||
Version: 3.5.12
|
||||
Release: %mkrel 1
|
||||
License: GPL
|
||||
Group: Archiving/Cd burning
|
||||
Source0: http://jaist.dl.sourceforge.net/sourceforge/k3b/k3b-%{version}.tar.bz2
|
||||
Source1: http://jaist.dl.sourceforge.net/sourceforge/k3b/k3b-i18n-%{k3b_18n_version}.tar.bz2
|
||||
Patch0: kde-3.5.10-acinclude.patch
|
||||
#Patch1: fix_autotools.patch
|
||||
#Patch2: new-ffmpeg.diff
|
||||
Patch3: iso-level-3.patch
|
||||
Patch4: verify-reload-fix.patch
|
||||
#Patch5: no-suid-warning.patch
|
||||
#Patch6: fix-k3bjobhandler_install.patch
|
||||
Patch7: kdebase-3.5.12-move-xdg-menu-dir.patch
|
||||
Patch8: kdebase-3.5.12-config.patch
|
||||
URL: http://www.k3b.org/
|
||||
Provides: k3b = %version-%release
|
||||
Requires: cdrecord
|
||||
Requires: mkisofs
|
||||
Requires: cdrdao
|
||||
Requires: sox
|
||||
Requires: vcdimager
|
||||
Requires: normalize
|
||||
Requires: kdebase-progs
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
BuildRequires: kde3-macros
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
%else
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
%endif
|
||||
BuildRequires: automake >= 1.6.1
|
||||
BuildRequires: libcdda-devel
|
||||
BuildRequires: kdelibs-devel
|
||||
BuildRequires: jpeg-devel
|
||||
BuildRequires: png-devel
|
||||
BuildRequires: X11-devel
|
||||
BuildRequires: mad-devel
|
||||
BuildRequires: arts-devel
|
||||
BuildRequires: libart_lgpl-devel
|
||||
BuildRequires: fam-devel
|
||||
BuildRequires: audiofile-devel
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: libvorbis-devel
|
||||
BuildRequires: nas-devel
|
||||
BuildRequires: libflac++-devel
|
||||
BuildRequires: libflac-devel
|
||||
BuildRequires: id3lib-devel
|
||||
BuildRequires: taglib-devel
|
||||
BuildRequires: musicbrainz-devel
|
||||
BuildRequires: ffmpeg-devel
|
||||
BuildRequires: libsndfile-devel
|
||||
BuildRequires: libmpcdec-devel
|
||||
BuildRequires: libsamplerate-devel
|
||||
BuildRequires: libdbus-qt-1-devel
|
||||
BuildRequires: GL-devel
|
||||
BuildRequires: hal-devel
|
||||
BuildRequires: libdvdread-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
Obsoletes: k3b < 1.95
|
||||
Requires: %libname = %version-%release
|
||||
|
||||
%description
|
||||
K3b is CD-writing software which intends to be feature-rich and
|
||||
provide an easily usable interface. Features include burning
|
||||
audio CDs from .WAV and .MP3 audio files, configuring external
|
||||
programs and configuring devices.
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files -f k3b.lang
|
||||
%defattr (-,root,root)
|
||||
%dir %_kde3_docdir/HTML/*/k3b
|
||||
%doc %_kde3_docdir/HTML/*/k3b/*
|
||||
%_kde3_libdir/kde3/*
|
||||
%_kde3_bindir/*
|
||||
%_kde3_datadir/applications/kde/*
|
||||
%_kde3_appsdir/konqueror/servicemenus/*
|
||||
%_kde3_datadir/mimelnk/application/*
|
||||
%dir %_kde3_appsdir/k3b/
|
||||
%_kde3_appsdir/k3b/*
|
||||
%_kde3_datadir/sounds/*.wav
|
||||
%_kde3_datadir/applnk/.hidden/*.desktop
|
||||
%_kde3_iconsdir/*/*/*/*
|
||||
%_kde3_appsdir/konqsidebartng/virtual_folders/services/videodvd.desktop
|
||||
%_kde3_datadir/services/kfile_k3b.desktop
|
||||
%_kde3_datadir/services/videodvd.protocol
|
||||
|
||||
#------------------------------------------------------------------
|
||||
|
||||
%package -n %libname
|
||||
Group: System/Libraries
|
||||
Summary: Libraries for %name
|
||||
Provides: libk3b = %version-%release
|
||||
Conflicts: k3b <= 0.9-3mdk
|
||||
Obsoletes: %oldlibname
|
||||
Obsoletes: %mklibname k3b 3 < %version-%release
|
||||
Obsoletes: %mklibname kde3-k3b 3 < %version-%release
|
||||
|
||||
%description -n %libname
|
||||
The libraries from %name package
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n %libname -p /sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %libname -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files -n %libname
|
||||
%defattr(-,root,root)
|
||||
%_kde3_libdir/libk3b.la
|
||||
%_kde3_libdir/libk3b.so.%{major}*
|
||||
%_kde3_libdir/libk3bdevice.so.*
|
||||
%_kde3_libdir/libk3bdevice.la
|
||||
|
||||
#------------------------------------------------------------------
|
||||
|
||||
%package devel
|
||||
Group: Development/Other
|
||||
Summary: Libraries for %name
|
||||
Requires: %libname = %version-%release
|
||||
Provides: kde3-k3b-devel = %{version}-%{release}
|
||||
Obsoletes: %oldlibname-devel
|
||||
Obsoletes: %libname-devel
|
||||
Conflicts: k3b <= 0.9-3mdk
|
||||
|
||||
%description devel
|
||||
Development libraries from %name
|
||||
|
||||
%files devel
|
||||
%defattr (-,root,root)
|
||||
%_kde3_includedir/*
|
||||
%_kde3_libdir/*.so
|
||||
|
||||
#------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q -c -n k3b
|
||||
%setup -q -T -D -c -a 1 -n k3b
|
||||
cd %_builddir/k3b/k3b-%version
|
||||
%if %mdkversion >= 201000
|
||||
%patch0 -p1
|
||||
#%patch1 -p1
|
||||
%endif
|
||||
#%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
#%patch5 -p1
|
||||
#%patch6 -p1
|
||||
%patch7 -p0
|
||||
%patch8 -p0
|
||||
|
||||
|
||||
cd %_builddir/k3b/k3b-i18n-%{k3b_18n_version}
|
||||
%if %mdkversion >= 201000
|
||||
%patch0 -p1
|
||||
#%patch1 -p1
|
||||
%endif
|
||||
cd %_builddir/k3b
|
||||
|
||||
%build
|
||||
export QTDIR=%qt3dir
|
||||
|
||||
PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
|
||||
|
||||
cd %_builddir/k3b/k3b-%version
|
||||
make -f admin/Makefile.common
|
||||
|
||||
%configure_kde3 \
|
||||
--without-cdrecord-suid-root \
|
||||
--with-k3bsetup=no
|
||||
|
||||
%make
|
||||
|
||||
cd -
|
||||
|
||||
cd %_builddir/k3b/k3b-i18n-%{k3b_18n_version}
|
||||
make -f admin/Makefile.common
|
||||
CFLAGS="${CFLAGS} %optflags"
|
||||
CXXFLAGS="${CXXFLAGS} %optflags"
|
||||
export CFLAGS CXXFLAGS
|
||||
%configure_kde3
|
||||
|
||||
# Necessary to regenerate po file !!!! Otherwise it's not generated
|
||||
make clean
|
||||
find -name *.gmo | xargs rm -f
|
||||
%make
|
||||
cd -
|
||||
|
||||
|
||||
%install
|
||||
rm -rf %buildroot
|
||||
mkdir -p %buildroot/%_kde3_datadir/applnk/Multimedia
|
||||
|
||||
cd %_builddir/k3b/k3b-%{version}
|
||||
%makeinstall_std
|
||||
cd -
|
||||
|
||||
cd %_builddir/k3b/k3b-i18n-%{k3b_18n_version}
|
||||
%makeinstall_std
|
||||
cd -
|
||||
|
||||
install -d %buildroot/%_kde3_datadir/applications/kde/
|
||||
desktop-file-install --vendor='' \
|
||||
--dir %buildroot/%_kde3_datadir/applications/kde/ \
|
||||
--remove-key='Encoding' \
|
||||
--remove-category='Application' \
|
||||
--remove-category='AudioVideo' \
|
||||
--add-category='Utility' \
|
||||
%buildroot/%_kde3_datadir/applications/kde/k3b.desktop
|
||||
|
||||
%find_lang k3b k3b k3bsetup libk3b libk3bdevice
|
||||
|
||||
%clean
|
||||
rm -rf %buildroot
|
||||
@ -1,89 +0,0 @@
|
||||
diff -ur k3b-1.0.4/ChangeLog k3b-1.0.4-verification-always-reload/ChangeLog
|
||||
--- k3b-1.0.4/ChangeLog 2007-11-02 10:55:57.000000000 +0100
|
||||
+++ k3b-1.0.4-verification-always-reload/ChangeLog 2007-12-07 19:33:18.000000000 +0100
|
||||
@@ -4,9 +4,6 @@
|
||||
* Unmount medium before DVD formatting
|
||||
* Silently (without introducing new strings for translation) allow the burning of files
|
||||
bigger than 4 GB with appropriate versions of genisoimage or mkisofs.
|
||||
- * Do only reload the medium before verification if necessary, i.e. if the newly written
|
||||
- track cannot be read otherwise (many old drives depend on this). Hopefully this will
|
||||
- at least work around the aweful "DMA disabled" bug for many users.
|
||||
|
||||
1.0.3
|
||||
=====
|
||||
diff -ur k3b-1.0.4/libk3b/jobs/k3bverificationjob.cpp k3b-1.0.4-verification-always-reload/libk3b/jobs/k3bverificationjob.cpp
|
||||
--- k3b-1.0.4/libk3b/jobs/k3bverificationjob.cpp 2007-11-02 10:55:53.000000000 +0100
|
||||
+++ k3b-1.0.4-verification-always-reload/libk3b/jobs/k3bverificationjob.cpp 2007-07-21 21:53:53.000000000 +0200
|
||||
@@ -84,8 +84,6 @@
|
||||
K3bPipe pipe;
|
||||
|
||||
bool readSuccessful;
|
||||
-
|
||||
- bool mediumHasBeenReloaded;
|
||||
};
|
||||
|
||||
|
||||
@@ -151,13 +149,11 @@
|
||||
d->currentTrackIndex = 0;
|
||||
d->alreadyReadSectors = 0;
|
||||
|
||||
- emit newTask( i18n("Checking medium") );
|
||||
+ // first we need to reload and mount the device
|
||||
+ emit newTask( i18n("Reloading the medium") );
|
||||
|
||||
- d->mediumHasBeenReloaded = false;
|
||||
- connect( K3bDevice::sendCommand( K3bDevice::DeviceHandler::DISKINFO, d->device ),
|
||||
- SIGNAL(finished(K3bDevice::DeviceHandler*)),
|
||||
- this,
|
||||
- SLOT(slotDiskInfoReady(K3bDevice::DeviceHandler*)) );
|
||||
+ connect( K3bDevice::reload( d->device ), SIGNAL(finished(bool)),
|
||||
+ this, SLOT(slotMediaReloaded(bool)) );
|
||||
}
|
||||
|
||||
|
||||
@@ -165,7 +165,6 @@
|
||||
K3bDevice::STATE_COMPLETE|K3bDevice::STATE_INCOMPLETE,
|
||||
K3bDevice::MEDIA_WRITABLE );
|
||||
|
||||
- d->mediumHasBeenReloaded = true;
|
||||
|
||||
emit newTask( i18n("Checking medium") );
|
||||
|
||||
@@ -191,6 +185,12 @@
|
||||
d->toc = dh->toc();
|
||||
d->totalSectors = 0;
|
||||
|
||||
+ if ( d->toc.isEmpty() ) {
|
||||
+ emit infoMessage( i18n( "No tracks to verify found." ), ERROR );
|
||||
+ jobFinished( false );
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
// just to be sure check if we actually have all the tracks
|
||||
int i = 0;
|
||||
for( QValueList<K3bVerificationJobTrackEntry>::iterator it = d->tracks.begin();
|
||||
@@ -201,21 +201,9 @@
|
||||
(*it).trackNumber = d->toc.count();
|
||||
|
||||
if( (int)d->toc.count() < (*it).trackNumber ) {
|
||||
- if ( d->mediumHasBeenReloaded ) {
|
||||
- emit infoMessage( i18n("Internal Error: Verification job improperly initialized (%1)")
|
||||
- .arg( "Specified track number not found on medium" ), ERROR );
|
||||
- jobFinished( false );
|
||||
- return;
|
||||
- }
|
||||
- else {
|
||||
- // many drives need to reload the medium to return to a proper state
|
||||
- emit newTask( i18n("Reloading the medium") );
|
||||
- connect( K3bDevice::reload( d->device ),
|
||||
- SIGNAL(finished(bool)),
|
||||
- this,
|
||||
- SLOT(slotMediaReloaded(bool)) );
|
||||
- return;
|
||||
- }
|
||||
+ emit infoMessage( i18n("Internal Error: Verification job improperly initialized"), ERROR );
|
||||
+ jobFinished( false );
|
||||
+ return;
|
||||
}
|
||||
|
||||
d->totalSectors += trackLength( i );
|
||||
@ -1,237 +0,0 @@
|
||||
%define name kde3-kaffeine
|
||||
%define oname kaffeine
|
||||
%define version 3.5.12
|
||||
%define pre rc2
|
||||
%define release %mkrel 1
|
||||
%define xineversion 1.1.11.1
|
||||
%define fversion %version
|
||||
%define _kde3_liconsdir %_kde3_iconsdir/large
|
||||
%define _kde3_miconsdir %_kde3_iconsdir/mini
|
||||
%define reallibname %mklibname %{oname} %{major}
|
||||
|
||||
Name: %{name}
|
||||
Version: %{version}
|
||||
Release: %{release}
|
||||
Summary: A Xine-based Media Player for KDE3
|
||||
License: GPL
|
||||
URL: http://kaffeine.sourceforge.net/
|
||||
Group: Graphical desktop/KDE3
|
||||
Source: http://prdownloads.sourceforge.net/kaffeine/%oname-%fversion.tar.bz2
|
||||
#Patch0: kaffeine_configure.patch
|
||||
#Patch1: kaffeine_dvb.diff
|
||||
#Patch2: kaffeine-link.diff
|
||||
#Patch3: kaffeine-0.8.8-fix_autotools.patch
|
||||
Patch4: kdebase-3.5.12-move-xdg-menu-dir.patch
|
||||
Patch5: kdebase-3.5.12-config.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: kde3-macros
|
||||
BuildRequires: kdelibs-devel
|
||||
BuildRequires: libxine-devel >= %xineversion
|
||||
BuildRequires: libgstreamer-plugins-base-devel >= 0.10
|
||||
BuildRequires: libcdda-devel
|
||||
BuildRequires: %{_lib}xorg-x11-devel
|
||||
BuildRequires: libcdio-devel
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 2.63
|
||||
%else
|
||||
BuildRequires: autoconf >= 2.65
|
||||
%endif
|
||||
BuildRequires: automake >= 1.6
|
||||
Requires: xine-plugins >= %xineversion
|
||||
Requires: kdelibs => 3.5.10
|
||||
Obsoletes: reallibname < 0.8.8
|
||||
Obsoletes: kaffeine < 0.8.8
|
||||
Provides: kaffeine = %version-%release
|
||||
|
||||
%description
|
||||
Kaffeine is a Xine-based Media Player for QT/KDE3.
|
||||
|
||||
|
||||
%package devel
|
||||
Group: Development/KDE and Qt
|
||||
Summary: Kaffeine kpart library headers
|
||||
Requires: %name = %version-%release
|
||||
Provides: kaffeine-devel = %version-%release
|
||||
Obsoletes: libkaffeine0-devel
|
||||
|
||||
%description devel
|
||||
Kaffeine is a Xine-based Media Player for QT/KDE3. This is a kpart
|
||||
library of Kaffeine.
|
||||
|
||||
%prep
|
||||
%setup -q -n %oname-%fversion
|
||||
#%patch0
|
||||
#%patch1
|
||||
#%patch2
|
||||
#%if %mdkversion >= 201000
|
||||
#%patch3 -p1
|
||||
#%endif
|
||||
%patch4 -p0
|
||||
%patch5 -p0
|
||||
|
||||
%build
|
||||
make -f admin/Makefile.common cvs
|
||||
export UNSERMAKE=NO
|
||||
export QTDIR=%qt3dir
|
||||
export QTLIB=%qt3lib
|
||||
export CFLAGS=${RPM_OPT_FLAGS}
|
||||
export CXXFLAGS=${RPM_OPT_FLAGSi}
|
||||
|
||||
PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
|
||||
export xdg_menudir=%_sysconfdir/xdg/kde/menus
|
||||
|
||||
make -f admin/Makefile.common cvs
|
||||
|
||||
%configure_kde3 --disable-final --without-lame
|
||||
|
||||
%make
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
%makeinstall_std
|
||||
|
||||
# (nl) this have been commited upstream, so remove desktop-file-install for next version
|
||||
desktop-file-install --vendor='' \
|
||||
--dir=%buildroot%_kde3_datadir/applications/kde \
|
||||
--remove-key='Encoding' \
|
||||
--remove-category='Application' \
|
||||
%buildroot%_kde3_datadir/applications/kde/*.desktop
|
||||
|
||||
|
||||
#mdk icons
|
||||
install -D -m 644 %{buildroot}%_kde3_iconsdir/hicolor/48x48/apps/%{oname}.png %{buildroot}%_kde3_liconsdir/%{oname}.png
|
||||
install -D -m 644 %{buildroot}%_kde3_iconsdir/hicolor/32x32/apps/%{oname}.png %{buildroot}%_kde3_iconsdir/%{oname}.png
|
||||
install -D -m 644 %{buildroot}%_kde3_iconsdir/hicolor/16x16/apps/%{oname}.png %{buildroot}%_kde3_miconsdir/%{oname}.png
|
||||
|
||||
|
||||
rm -f %buildroot%_kde3_datadir/mimelnk/application/x-mplayer2.desktop
|
||||
|
||||
#rename language files as kaffeine.mo
|
||||
#otherwise we can't use translations on Mandy.(# Atilla ÖNTAŞ)
|
||||
for i in $(find %buildroot%_kde3_datadir/locale -name "*-0.8.8.mo"); do j=$(echo $i | sed 's/-0.8.8.mo/.mo/g'); mv "$i" "$j"; done
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
|
||||
%files
|
||||
|
||||
%defattr(-,root,root)
|
||||
%doc AUTHORS COPYING INSTALL README TODO
|
||||
%_kde3_bindir/kaffeine
|
||||
%doc %_kde3_datadir/doc/HTML/en/kaffeine/
|
||||
%_kde3_datadir/applications/kde/kaffeine.desktop
|
||||
%_kde3_datadir/mimelnk/*/*
|
||||
%_kde3_appsdir/konqueror/servicemenus/*
|
||||
%_kde3_datadir/apps/gstreamerpart/gstreamer_part.rc
|
||||
%_kde3_libdir/kde3/*
|
||||
%_kde3_datadir/apps/kaffeine/*
|
||||
%_kde3_appsdir/profiles/kaffeine.profile.xml
|
||||
%_kde3_datadir/services/*
|
||||
%_kde3_iconsdir/hicolor/*/*/*.png
|
||||
%_kde3_liconsdir/%{oname}.png
|
||||
%_kde3_miconsdir/%{oname}.png
|
||||
%_kde3_iconsdir/%{oname}.png
|
||||
%_kde3_datadir/servicetypes/kaffeineaudioencoder.desktop
|
||||
%_kde3_datadir/servicetypes/kaffeinedvbplugin.desktop
|
||||
%_kde3_datadir/servicetypes/kaffeineepgplugin.desktop
|
||||
%_kde3_libdir/libkaffeinepart.so
|
||||
%_kde3_datadir/locale/*
|
||||
|
||||
|
||||
|
||||
#--------------------------------------------------------------
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%_kde3_includedir/%oname/
|
||||
%_kde3_libdir/libkaffeineaudioencoder.la
|
||||
%_kde3_libdir/libkaffeineaudioencoder.so
|
||||
%_kde3_libdir/libkaffeinedvbplugin.la
|
||||
%_kde3_libdir/libkaffeinedvbplugin.so
|
||||
%_kde3_libdir/libkaffeinepart.la
|
||||
%_kde3_libdir/libkaffeineepgplugin.la
|
||||
%_kde3_libdir/libkaffeineepgplugin.so
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package engine-gstreamer
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: GStreamer engine for kaffeine
|
||||
Requires: %{name}
|
||||
Requires: gstreamer0.10-plugins-base >= 0.10
|
||||
Requires: gstreamer0.10-plugins-good
|
||||
Provides: kaffeine-engine-gstreamer
|
||||
Obsoletes:kaffeine-engine-gstreamer < 0.8.8
|
||||
|
||||
%description engine-gstreamer
|
||||
Summary: gstreamer engine for kaffeine
|
||||
|
||||
%files engine-gstreamer
|
||||
%defattr(-,root,root)
|
||||
%_kde3_libdir/kde3/libgstreamer*
|
||||
%_kde3_appsdir/gstreamerpart
|
||||
%_kde3_datadir/services/gstreamer*
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%define major 0
|
||||
%define libname %mklibname %{name} %{major}
|
||||
%define reallibname %mklibname %{oname} %{major}
|
||||
|
||||
%package -n %libname
|
||||
Group: System/Libraries
|
||||
Summary: Kaffeine kpart library
|
||||
Obsoletes: %{reallibname} < 0.8.8
|
||||
Provides: %{reallibname}
|
||||
|
||||
%description -n %libname
|
||||
Kaffeine is a Xine-based Media Player for QT/KDE3. This is a kpart
|
||||
library of Kaffeine.
|
||||
|
||||
|
||||
%files -n %libname
|
||||
%defattr(-,root,root)
|
||||
%_kde3_libdir/lib*.so.*
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package engine-xine
|
||||
Group: Graphical desktop/KDE3
|
||||
Requires: xine-plugins
|
||||
Summary: Xine engine for kaffeine
|
||||
BuildRequires: gstreamer0.10-devel
|
||||
BuildRequires: libgstreamer0.10-plugins-base-devel
|
||||
BuildRequires: libxine-devel
|
||||
Requires: %{name}
|
||||
Provides: kaffeine-engine-xine
|
||||
Obsoletes:kaffeine-engine-xine < 0.8.8
|
||||
|
||||
%description engine-xine
|
||||
Summary: Xine engine for kaffeine
|
||||
|
||||
%files engine-xine
|
||||
%defattr(-,root,root)
|
||||
%_kde3_libdir/kde3/libxine*
|
||||
%_kde3_appsdir/kaffeine/xine*
|
||||
%_kde3_datadir/services/xine*
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
%changelog
|
||||
|
||||
* Mon Jul 25 2011 Tim Williams <tim@my-place.org.uk> 3.5.12-1mvf2011.2
|
||||
+ Update to Trinity 3.5.12 sources
|
||||
- Remove kaffeine-0.8.8-fix_autotools.patch, kaffeine_configure.patch, kaffeine-link.diff
|
||||
+ Add kdebase-3.5.12-move-xdg-menu-dir.patch, kdebase-3.5.12-config.patch
|
||||
|
||||
* Sat Apr 08 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.8.8-3mvt2010.1
|
||||
- fix buildrequires
|
||||
- rebuild for 2010.1
|
||||
|
||||
* Tue Feb 09 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.8.8-2mvt2010.0
|
||||
- Fix built with autoconf 2.65 and automake 1.11
|
||||
- Change package group
|
||||
|
||||
* Sat Nov 21 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.8.8-1mvt2010.0
|
||||
- Build KDE3 package for Mandriva
|
||||
@ -1,12 +0,0 @@
|
||||
--- kbudget/kbudget.cpp.orig 2009-03-25 18:31:24.000000000 +0100
|
||||
+++ kbudget/kbudget.cpp 2009-03-25 18:34:08.000000000 +0100
|
||||
@@ -16,7 +16,8 @@
|
||||
***************************************************************************/
|
||||
|
||||
#include <config.h>
|
||||
-
|
||||
+#include <stdlib.h>
|
||||
+
|
||||
// include files for QT
|
||||
#include <qdir.h>
|
||||
#include <qprinter.h>
|
||||
@ -1,159 +0,0 @@
|
||||
Summary: Budgeting and personal finance program for KDE
|
||||
Name: kbudget
|
||||
Version: 0.6
|
||||
Release: %mkrel 13
|
||||
License: GPL
|
||||
Group: Office
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
URL: http://www.garandnet.net/kbudget/
|
||||
BuildRoot: %{_tmppath}/%{name}-buildroot
|
||||
BuildRequires: kdelibs3-devel
|
||||
Patch0: kbudget-0.6-stdio.patch
|
||||
|
||||
%description
|
||||
KBudget is a budgeting and personal finance program for KDE.
|
||||
It requires KDE 3 and is currently in early development.
|
||||
|
||||
%prep
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%setup -q
|
||||
%patch0 -p0
|
||||
|
||||
%build
|
||||
#make -f admin/Makefile.common cvs
|
||||
|
||||
export QTDIR=%_prefix/%_lib/qt3
|
||||
export KDEDIR=%_prefix
|
||||
|
||||
export LD_LIBRARY_PATH=$QTDIR/%_lib:$KDEDIR/%_lib:$LD_LIBRARY_PATH
|
||||
export PATH=$QTDIR/bin:$KDEDIR/bin:$PATH
|
||||
|
||||
# Search for qt/kde libraries in the right directories (avoid patch)
|
||||
# NOTE: please don't regenerate configure scripts below
|
||||
perl -pi -e "s@/lib(\"|\b[^/])@/%_lib\1@g if /(kde|qt)_(libdirs|libraries)=/" configure
|
||||
|
||||
%configure_kde3
|
||||
|
||||
%make
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
#make prefix=%{buildroot}%{_prefix} install
|
||||
%makeinstall
|
||||
%find_lang kbudget
|
||||
|
||||
%{__cp} %{buildroot}%{_iconsdir}/crystalsvg/22x22/apps/%{name}.png %{buildroot}%{_iconsdir}/%{name}.png
|
||||
mkdir -p %{buildroot}%{_miconsdir}
|
||||
%{__cp} %{buildroot}%{_iconsdir}/crystalsvg/16x16/apps/%{name}.png %{buildroot}%{_miconsdir}/%{name}.png
|
||||
mkdir -p %{buildroot}%{_liconsdir}
|
||||
%{__cp} %{buildroot}%{_iconsdir}/crystalsvg/48x48/apps/%{name}.png %{buildroot}%{_liconsdir}/%{name}.png
|
||||
|
||||
|
||||
install -m 755 -d %buildroot%{_menudir}
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%post
|
||||
%if %mdkversion > 200600
|
||||
%update_icon_cache crystalsvg
|
||||
%endif
|
||||
|
||||
%postun
|
||||
%if %mdkversion > 200600
|
||||
%clean_icon_cache crystalsvg
|
||||
%endif
|
||||
|
||||
%files -f kbudget.lang
|
||||
%defattr(-, root, root, 0755)
|
||||
%doc README AUTHORS
|
||||
%_bindir/%{name}
|
||||
|
||||
|
||||
# copy regular icons to %_icondir
|
||||
%_iconsdir/%name.png
|
||||
%_liconsdir/%name.png
|
||||
%_miconsdir/%name.png
|
||||
|
||||
|
||||
%_iconsdir/crystalsvg/128x128/apps/*
|
||||
%_iconsdir/crystalsvg/128x128/mimetypes/*
|
||||
%_iconsdir/crystalsvg/16x16/apps/*
|
||||
%_iconsdir/crystalsvg/16x16/mimetypes/*
|
||||
%_iconsdir/crystalsvg/22x22/apps/*
|
||||
%_iconsdir/crystalsvg/22x22/mimetypes/*
|
||||
%_iconsdir/crystalsvg/32x32/apps/*
|
||||
%_iconsdir/crystalsvg/32x32/mimetypes/*
|
||||
%_iconsdir/crystalsvg/48x48/apps/*
|
||||
%_iconsdir/crystalsvg/48x48/mimetypes/*
|
||||
%_iconsdir/crystalsvg/scalable/apps/*
|
||||
%_iconsdir/crystalsvg/scalable/mimetypes/*
|
||||
|
||||
%_datadir/applnk/Applications/%{name}.desktop
|
||||
%_datadir/mimelnk/application/x-%{name}.desktop
|
||||
%dir %_datadir/apps/%{name}
|
||||
%_datadir/apps/%{name}/*.rc
|
||||
|
||||
# other html doc
|
||||
%dir %_defaultdocdir/HTML/en/kbudget
|
||||
%_defaultdocdir/HTML/en/kbudget/*
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jul 21 2011 Tim Williams <tim@my-place.org.uk> 0.6-13mdv2010.2
|
||||
+ Rebuild against Trinity 3.5.12
|
||||
|
||||
* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 0.6-12mdv2010.1
|
||||
+ MDV 2010.1 rebuild
|
||||
|
||||
* Tue Nov 17 2009 Tim Williams <tim@my-place.org.uk> 0.6-11mdv2010.0
|
||||
+ MDV 2010.0 rebuild
|
||||
|
||||
* Wed Mar 25 2009 Helio Chissini de Castro <helio@mandriva.com> 0.6-10mdv2009.1
|
||||
+ Revision: 361079
|
||||
- Bump to rebuild against cooker
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- rebuild
|
||||
|
||||
* Tue Feb 19 2008 Thierry Vignaud <tvignaud@mandriva.com> 0.6-7mdv2008.1
|
||||
+ Revision: 172392
|
||||
- fix update-menus-without-menu-file-in-%%post(|un)
|
||||
- kdedesktop2mdkmenu.pl is no more
|
||||
- rebuild
|
||||
- fix "foobar is blabla" summary (=> "blabla") so that it looks nice in rpmdrake
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
- import kbudget
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
|
||||
* Mon Jun 26 2006 Nicolas Lécureuil <neoclust@mandriva.org> 0.6-6mdv2007.0
|
||||
- Use new menu
|
||||
- Register icons
|
||||
|
||||
* Fri Dec 23 2005 Nicolas Lécureuil <neoclust@mandriva.org> 0.6-5mdk
|
||||
- Fix Build
|
||||
- use mkrel
|
||||
- BuildRequires : kdelibs-devel
|
||||
|
||||
* Fri May 06 2005 Laurent MONTEL <lmontel@mandriva.com> 0.6-4mdk
|
||||
- Fix build on x86_64
|
||||
|
||||
* Mon Jun 14 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6-3mdk
|
||||
- Rebuils
|
||||
|
||||
* Tue Feb 24 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6-2mdk
|
||||
- Fix distlint
|
||||
|
||||
* Wed Dec 31 2003 Lenny Cartier <lenny@mandrakesoft.com> 0.6-1mdk
|
||||
- 0.6
|
||||
|
||||
* Sun Oct 15 2003 Nicolas CHIPAUX <chipaux@mandrakesoft.com> 0.5-2mdk
|
||||
- libdir fix
|
||||
|
||||
* Sun Sep 23 2003 Nicolas CHIPAUX <chipaux@mandrakesoft.com> 0.5-1mdk
|
||||
- Initial release
|
||||
@ -1,10 +0,0 @@
|
||||
--- kdebluetooth/kcm_btpaired/pairedtab.h.orig 2009-03-25 22:45:39.000000000 +0100
|
||||
+++ kdebluetooth/kcm_btpaired/pairedtab.h 2009-03-25 22:46:23.000000000 +0100
|
||||
@@ -34,6 +34,7 @@
|
||||
#include <qstringlist.h>
|
||||
#include <qdatetime.h>
|
||||
#include <vector>
|
||||
+#include <stdint.h>
|
||||
|
||||
#include "exportdialog.h"
|
||||
|
||||
|
Before Width: | Height: | Size: 5.2 KiB |
@ -1,188 +0,0 @@
|
||||
%define oname kio-sysinfo
|
||||
Name: kde3-%oname
|
||||
Version: 1.8.2
|
||||
Release: %mkrel 14
|
||||
Summary: KIO Slave sysinfo:/
|
||||
License: LGPL
|
||||
Group: System/Libraries
|
||||
URL: http://www.kde-apps.org/content/show.php?content=58704
|
||||
Source0: http://download.tuxfamily.org/kiosysinfo/Sources/%oname-%version.tar.gz
|
||||
# Source1: 48x48/apps/kcmprocessor.png
|
||||
Source1: cpu.png
|
||||
# Source2: 48x48/devices/system.png
|
||||
Source2: sysinfo.png
|
||||
Patch0: kio-sysinfo-1.8.2-suse-10.3.patch
|
||||
Patch1: kio-sysinfo-1.8.2-uz-translation.patch
|
||||
Patch2: kio-sysinfo-1.8.2-gcc4.patch
|
||||
Patch3: kde-3.5.10-acinclude.patch
|
||||
Patch4: fix_autotools.patch
|
||||
BuildRequires: kdelibs-devel
|
||||
BuildRequires: hal-devel
|
||||
BuildRequires: dbus-devel
|
||||
BuildRequires: libhd-devel
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
%endif
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
BuildRequires: automake >= 1.6.1
|
||||
BuildRequires: kde3-macros
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}
|
||||
Obsoletes: sysinfo < 1.8.2-4
|
||||
|
||||
%description
|
||||
KIO Slave sysinfo:/. It shows various information about your pc,
|
||||
like cpu, ram. kernel version, exc. It also shows the removable
|
||||
devices and partition (total space/available space) and you can open,
|
||||
mount and unmount it from this KIO slave.
|
||||
|
||||
%files -f kio_sysinfo.lang
|
||||
%defattr(-,root,root)
|
||||
%{_kde3_libdir}/kde3/*
|
||||
%{_kde3_datadir}/applications/kde/kfmclient_sysinfo.desktop
|
||||
%{_kde3_appsdir}/sysinfo
|
||||
%{_kde3_datadir}/mimelnk/application/x-sysinfo.desktop
|
||||
%{_kde3_datadir}/services/ksysinfopart.desktop
|
||||
%{_kde3_datadir}/services/sysinfo.protocol
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q -n %{oname}-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%if %mdkversion >= 201000
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%endif
|
||||
%__cp -f %SOURCE1 about/images/cpu.png
|
||||
%__cp -f %SOURCE2 about/images/sysinfo.png
|
||||
|
||||
%build
|
||||
make -f admin/Makefile.common
|
||||
|
||||
%configure_kde3 \
|
||||
--with-qt-dir=%{qt3dir} \
|
||||
--with-qt-includes=%{qt3include} \
|
||||
--with-qt-libraries=%{qt3lib}
|
||||
|
||||
%make
|
||||
|
||||
%install
|
||||
rm -rf %buildroot
|
||||
|
||||
%makeinstall_std
|
||||
|
||||
%{find_lang} kio_sysinfo
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
|
||||
%changelog
|
||||
|
||||
* Thu Jul 14 2011 Tim Williams <tim@my-place.org.uk> 1.8.2-14mvt2010.2
|
||||
+ rebuild for trinity KDE
|
||||
|
||||
* Mon Jul 19 2010 Tim Williams <tim@my-place.org.uk> 1.8.2-13mvt2010
|
||||
+ Rebuild for MDV 2010.1
|
||||
|
||||
* Sun Feb 07 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1.8.2-12mvt2010
|
||||
+ Fix built with autoconf 2.65 and asutmoake 1.11
|
||||
|
||||
* Fri Nov 13 2009 Tim Williams <tim@my-place.org.uk> 1.8.2-11mdv2010.0
|
||||
+ Rebuild for MDV 2010.0
|
||||
|
||||
* Tue Jun 24 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1.8.2-10mdv2009.0
|
||||
+ Revision: 228752
|
||||
- Fix specfile name
|
||||
- Fix with new name
|
||||
|
||||
* Sun Jun 08 2008 Funda Wang <fundawang@mandriva.org> 1.8.2-10mdv2009.0
|
||||
+ Revision: 216987
|
||||
- rebuild for new major of hwinfo
|
||||
|
||||
* Thu May 08 2008 Helio Chissini de Castro <helio@mandriva.com> 1.8.2-9mdv2009.0
|
||||
+ Revision: 204707
|
||||
- Move to /opt
|
||||
|
||||
* Tue Apr 01 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1.8.2-8mdv2008.1
|
||||
+ Revision: 191468
|
||||
- Use neutral icon again
|
||||
|
||||
* Wed Mar 26 2008 Helio Chissini de Castro <helio@mandriva.com> 1.8.2-7mdv2008.1
|
||||
+ Revision: 190353
|
||||
- Fix for bug https://qa.mandriva.com/show_bug.cgi?id=39173 - Proper dbus/hal device handling
|
||||
|
||||
* Thu Jan 03 2008 Oden Eriksson <oeriksson@mandriva.com> 1.8.2-6mdv2008.1
|
||||
+ Revision: 141781
|
||||
- rebuilt against openldap-2.4.7 libs
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
|
||||
* Sun Oct 21 2007 Funda Wang <fundawang@mandriva.org> 1.8.2-5mdv2008.1
|
||||
+ Revision: 100829
|
||||
- Updated patch0 from bug#32822
|
||||
|
||||
* Fri Oct 12 2007 Funda Wang <fundawang@mandriva.org> 1.8.2-4mdv2008.1
|
||||
+ Revision: 97268
|
||||
- Rename to kio-sysinfo as sysinfo is too confusing
|
||||
|
||||
* Thu Sep 27 2007 Funda Wang <fundawang@mandriva.org> 1.8.2-3mdv2008.0
|
||||
+ Revision: 93343
|
||||
- really fix bug#32031
|
||||
|
||||
* Tue Aug 28 2007 Helio Chissini de Castro <helio@mandriva.com> 1.8.2-2mdv2008.0
|
||||
+ Revision: 72846
|
||||
- Fix mimelnk placement
|
||||
|
||||
* Tue Aug 21 2007 Funda Wang <fundawang@mandriva.org> 1.8.2-1mdv2008.0
|
||||
+ Revision: 68729
|
||||
- New version 1.8.2
|
||||
|
||||
+ Eskild Hustvedt <eskild@mandriva.org>
|
||||
- Fixed description
|
||||
|
||||
* Sat Aug 04 2007 Funda Wang <fundawang@mandriva.org> 1.8.1-1mdv2008.0
|
||||
+ Revision: 58918
|
||||
- Rediff uz patch
|
||||
|
||||
+ Tomasz Pawel Gajc <tpg@mandriva.org>
|
||||
- new version
|
||||
- bzip2 sources
|
||||
|
||||
* Wed Jul 25 2007 Funda Wang <fundawang@mandriva.org> 1.8-2mdv2008.0
|
||||
+ Revision: 55432
|
||||
- Add uz translation to fix mdvbug#32031
|
||||
|
||||
* Tue Jul 24 2007 Funda Wang <fundawang@mandriva.org> 1.8-1mdv2008.0
|
||||
+ Revision: 55039
|
||||
- New version
|
||||
- uz translation has been merged upstream
|
||||
- do not use autotools for kde packages
|
||||
- use aclocal
|
||||
- BR libhd
|
||||
- Replace images with icons here: http://www.kde-look.org/content/show.php?content=61727
|
||||
- New verison
|
||||
- rediff patch
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- New patch for Uzbek translations (thanks to Mashrab Kuvatov)
|
||||
- [FEATURE] Add Uzbek translations ( thanks to Mashrab Kuvatov) (bug report #32031)
|
||||
|
||||
* Thu Jun 07 2007 Anssi Hannula <anssi@mandriva.org> 1.3-4mdv2008.0
|
||||
+ Revision: 36204
|
||||
- rebuild with correct optflags
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
-Patch0: Make Sysinfo:/ display Mandriva Linux on System: instead of nothing
|
||||
|
||||
* Mon Jun 04 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1.3-2mdv2008.0
|
||||
+ Revision: 35108
|
||||
- Fix File List
|
||||
- Import sysinfo
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- kio-sysinfo-1.8.2/src/sysinfo.cpp.orig 2009-11-13 15:20:27.000000000 +0000
|
||||
+++ kio-sysinfo-1.8.2/src/sysinfo.cpp 2009-11-13 15:24:53.000000000 +0000
|
||||
@@ -245,7 +245,7 @@
|
||||
|
||||
static unsigned long int scan_one( const char* buff, const char *key )
|
||||
{
|
||||
- char *b = strstr( buff, key );
|
||||
+ const char *b = strstr( buff, key );
|
||||
if ( !b )
|
||||
return 0;
|
||||
unsigned long int val = 0;
|
||||
@ -1,769 +0,0 @@
|
||||
diff -u -r kio-sysinfo-1.8.2/src/ksysinfopart.cpp kio-sysinfo-10.3/src/ksysinfopart.cpp
|
||||
--- kio-sysinfo-1.8.2/src/ksysinfopart.cpp 2006-05-20 14:21:16.000000000 -0300
|
||||
+++ kio-sysinfo-10.3/src/ksysinfopart.cpp 2007-08-14 13:09:50.000000000 -0300
|
||||
@@ -84,6 +84,10 @@
|
||||
rescanTimer=new QTimer(this);
|
||||
connect(rescanTimer, SIGNAL(timeout()), SLOT(rescan()));
|
||||
rescanTimer->start(20000, true);
|
||||
+ setJScriptEnabled(false);
|
||||
+ setJavaEnabled(false);
|
||||
+ setPluginsEnabled(false);
|
||||
+ setMetaRefreshEnabled(false);
|
||||
|
||||
connectDCOPSignal("kded", "networkstatus", "statusChange(QString,int)", "rescan()", false);
|
||||
installEventFilter( this );
|
||||
Somente em kio-sysinfo-1.8.2/src: Makefile
|
||||
diff -u -r kio-sysinfo-1.8.2/src/Makefile.am kio-sysinfo-10.3/src/Makefile.am
|
||||
--- kio-sysinfo-1.8.2/src/Makefile.am 2006-05-20 14:21:16.000000000 -0300
|
||||
+++ kio-sysinfo-10.3/src/Makefile.am 2007-08-14 13:07:17.000000000 -0300
|
||||
@@ -1,10 +1,11 @@
|
||||
+SUBDIRS = .
|
||||
|
||||
INCLUDES = $(all_includes) `pkg-config --cflags hal`
|
||||
|
||||
kde_module_LTLIBRARIES = kio_sysinfo.la libksysinfopart.la
|
||||
|
||||
kio_sysinfo_la_SOURCES = sysinfo.cpp
|
||||
-kio_sysinfo_la_LIBADD = $(LIB_KIO) -lGL
|
||||
+kio_sysinfo_la_LIBADD = $(LIB_KIO) -lhd -lGL
|
||||
kio_sysinfo_la_LDFLAGS = -module -avoid-version $(all_libraries) $(KDE_PLUGIN) $$(pkg-config --libs hal)
|
||||
|
||||
kde_services_DATA = sysinfo.protocol ksysinfopart.desktop
|
||||
@@ -15,13 +16,11 @@
|
||||
|
||||
xdg_apps_DATA = kfmclient_sysinfo.desktop
|
||||
|
||||
-podir=../po
|
||||
-COMMAND=$(XGETTEXT) --foreign-user -C -ci18n -ki18n -ktr2i18n -kI18N_NOOP -kI18N_NOOP2 -kaliasLocale
|
||||
messages:
|
||||
- $(COMMAND) *.cpp -o $(podir)/kio_sysinfo.pot
|
||||
+ $(XGETTEXT) *.cpp -o $(podir)/kio_sysinfo.pot
|
||||
|
||||
METASOURCES = AUTO
|
||||
|
||||
apps_DATA = x-sysinfo.desktop
|
||||
-appsdir = $(kde_mimedir)/applications
|
||||
+appsdir = $(kde_mimedir)/application
|
||||
|
||||
Somente em kio-sysinfo-1.8.2/src: Makefile.in
|
||||
diff -u -r kio-sysinfo-1.8.2/src/sysinfo.cpp kio-sysinfo-10.3/src/sysinfo.cpp
|
||||
--- kio-sysinfo-1.8.2/src/sysinfo.cpp 2007-08-21 08:12:15.000000000 -0300
|
||||
+++ kio-sysinfo-10.3/src/sysinfo.cpp 2007-09-21 13:41:53.000000000 -0300
|
||||
@@ -25,7 +25,6 @@
|
||||
|
||||
#include <qfile.h>
|
||||
#include <qdir.h>
|
||||
-#include <qregexp.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <math.h>
|
||||
@@ -56,22 +55,22 @@
|
||||
#include <kglobalsettings.h>
|
||||
#include <ktempfile.h>
|
||||
|
||||
-
|
||||
#include "sysinfo.h"
|
||||
|
||||
|
||||
using namespace KIO;
|
||||
#define BR "<br>"
|
||||
|
||||
-static QString formattedUnit( unsigned long long value, int post=1 )
|
||||
+static QString formattedUnit( Q_UINT64 value, int post=1 )
|
||||
{
|
||||
- if (value > (1024 * 1024))
|
||||
- if (value > (1024 * 1024 * 1024))
|
||||
- return i18n("%1 GB").arg(KGlobal::locale()->formatNumber(value / (1024 * 1024 * (post == 0 ? 1024 : 1024.0)), post));
|
||||
+ if (value >= (1024 * 1024))
|
||||
+ if (value >= (1024 * 1024 * 1024))
|
||||
+ return i18n("%1 GB").arg(KGlobal::locale()->formatNumber(value / (1024 * 1024 * 1024.0),
|
||||
+ post));
|
||||
else
|
||||
- return i18n("%1 MB").arg(KGlobal::locale()->formatNumber(value / (1024 * (post == 0 ? 1024 : 1024.0)), post));
|
||||
+ return i18n("%1 MB").arg(KGlobal::locale()->formatNumber(value / (1024 * 1024.0), post));
|
||||
else
|
||||
- return i18n("%1 KB").arg(KGlobal::locale()->formatNumber(value / (post == 0 ? 1024 : 1024.0), post));
|
||||
+ return i18n("%1 KB").arg(KGlobal::locale()->formatNumber(value / 1024.0, post));
|
||||
}
|
||||
|
||||
static QString htmlQuote(const QString& _s)
|
||||
@@ -124,46 +123,39 @@
|
||||
|
||||
void kio_sysinfoProtocol::get( const KURL & /*url*/ )
|
||||
{
|
||||
- FILE *fp; //this pointer is used to open file
|
||||
-
|
||||
mimeType( "application/x-sysinfo" );
|
||||
|
||||
+ // CPU info
|
||||
+ infoMessage( i18n( "Looking for CPU information..." ) );
|
||||
+ cpuInfo();
|
||||
+
|
||||
// header
|
||||
QString location = locate( "data", "sysinfo/about/my-computer.html" );
|
||||
QFile f( location );
|
||||
f.open( IO_ReadOnly );
|
||||
QTextStream t( &f );
|
||||
-
|
||||
- infoMessage(i18n("Looking for hardware information..."));
|
||||
-
|
||||
QString content = t.read();
|
||||
- content = content.arg( i18n( "My Computer" ) ); // <title>
|
||||
-
|
||||
- content = content.arg( "file:" + locate( "data", "sysinfo/about/style.css" ) );
|
||||
-
|
||||
- content = content.arg( i18n( "My Computer" ) ); // <h1>
|
||||
- content = content.arg( i18n( "Folders, Harddisks, Removable Devices, System Information and more..." ) ); // catchphrase
|
||||
+ content = content.arg( i18n( "My Computer" ),
|
||||
+ htmlQuote("file:" + locate( "data", "sysinfo/about/style.css" )),
|
||||
+ i18n( "My Computer"),
|
||||
+ i18n( "Folders, Harddisks, Removable Devices, System Information and more..." ));
|
||||
|
||||
QString sysInfo = "<div id=\"column2\">"; // table with 2 cols
|
||||
QString dummy;
|
||||
|
||||
// disk info
|
||||
- sysInfo += "<h2 id=\"hdds\">" + i18n( "Disks Information" ) + "</h2>";
|
||||
+ infoMessage( i18n( "Looking for disk information..." ) );
|
||||
+ sysInfo += "<h2 id=\"hdds\">" + i18n( "Disk Information" ) + "</h2>";
|
||||
sysInfo += diskInfo();
|
||||
|
||||
osInfo();
|
||||
sysInfo += "<h2 id=\"sysinfo\">" +i18n( "OS Information" ) + "</h2>";
|
||||
sysInfo += "<table>";
|
||||
- sysInfo += "<tr><td>" + i18n( "OS:" ) + "</td><td>" + m_info[OS_SYSNAME] + " " + m_info[OS_RELEASE] + " " + m_info[OS_MACHINE] + "</td></tr>";
|
||||
- sysInfo += "<tr><td>" + i18n( "Current user:" ) + "</td><td>" + m_info[OS_USER] + "@" + m_info[OS_HOSTNAME] + "</td></tr>";
|
||||
- sysInfo += "<tr><td>" + i18n( "System:" ) + "</td><td>" + m_info[OS_SYSTEM] + "</td></tr>";
|
||||
-
|
||||
- if((fp =fopen ("/etc/lsb-release", "r"))!=NULL) {
|
||||
- fclose(fp);
|
||||
- sysInfo += "<tr><td>" + i18n( "Version:" ) + "</td><td>" + m_info[OS_VERSION] + "</td></tr>";
|
||||
-
|
||||
- }
|
||||
-
|
||||
+ sysInfo += "<tr><td>" + i18n( "OS:" ) + "</td><td>" + htmlQuote(m_info[OS_SYSNAME]) + " " +
|
||||
+ htmlQuote(m_info[OS_RELEASE]) + " " + htmlQuote(m_info[OS_MACHINE]) + "</td></tr>";
|
||||
+ sysInfo += "<tr><td>" + i18n( "Current user:" ) + "</td><td>" + htmlQuote(m_info[OS_USER]) + "@"
|
||||
+ + htmlQuote(m_info[OS_HOSTNAME]) + "</td></tr>";
|
||||
+ sysInfo += "<tr><td>" + i18n( "System:" ) + "</td><td>" + htmlQuote(m_info[OS_SYSTEM]) + "</td></tr>";
|
||||
sysInfo += "<tr><td>" + i18n( "KDE:" ) + "</td><td>" + KDE::versionString() + "</td></tr>";
|
||||
sysInfo += "</table>";
|
||||
|
||||
@@ -172,34 +164,30 @@
|
||||
{
|
||||
sysInfo += "<h2 id=\"display\">" + i18n( "Display Info" ) + "</h2>";
|
||||
sysInfo += "<table>";
|
||||
- sysInfo += "<tr><td>" + i18n( "Vendor:" ) + "</td><td>" + m_info[GFX_VENDOR] + "</td></tr>";
|
||||
- sysInfo += "<tr><td>" + i18n( "Model:" ) + "</td><td>" + m_info[GFX_MODEL] + "</td></tr>";
|
||||
+ sysInfo += "<tr><td>" + i18n( "Vendor:" ) + "</td><td>" + htmlQuote(m_info[GFX_VENDOR]) + "</td></tr>";
|
||||
+ sysInfo += "<tr><td>" + i18n( "Model:" ) + "</td><td>" + htmlQuote(m_info[GFX_MODEL]) + "</td></tr>";
|
||||
if (!m_info[GFX_DRIVER].isNull())
|
||||
- sysInfo += "<tr><td>" + i18n( "Driver:" ) + "</td><td>" + m_info[GFX_DRIVER] + "</td></tr>";
|
||||
+ sysInfo += "<tr><td>" + i18n( "Driver:" ) + "</td><td>" + htmlQuote(m_info[GFX_DRIVER]) + "</td></tr>";
|
||||
sysInfo += "</table>";
|
||||
}
|
||||
|
||||
sysInfo += "</div><div id=\"column1\">"; // second column
|
||||
|
||||
// OS info
|
||||
+ infoMessage( i18n( "Getting OS information...." ) );
|
||||
|
||||
// common folders
|
||||
- sysInfo += "<h2 id=\"dirs\">" + i18n( "Common Folders" ) + "</h2>";
|
||||
- sysInfo += "<ul>";
|
||||
-
|
||||
- sysInfo += QString( "<li><a href=\"file:%1\">" ).arg( QDir::homeDirPath() ) + i18n( "My Home Folder" ) + "</a></li>";
|
||||
- sysInfo += QString( "<li><a href=\"file:%1\">" ).arg( QDir::rootDirPath() ) + i18n( "Root Folder" ) + "</a></li>";
|
||||
-
|
||||
- if((fp =fopen ("/usr/lib/kde3/kio_apt.so", "r"))!=NULL) {
|
||||
- sysInfo += "<li><a href=\"apt:/\">" + i18n( "Repository" ) + "</a></li>";
|
||||
- fclose(fp);
|
||||
- }
|
||||
- //sysInfo += "<li><a href=\"programs:/\">" + i18n( "Application" ) + "</a></li>";
|
||||
-
|
||||
+ sysInfo += "<h2 id=\"dirs\">" + i18n( "Common Folders" ) + "</h2>"; sysInfo += "<ul>";
|
||||
+ if ( KStandardDirs::exists( KGlobalSettings::documentPath() + "/" ) )
|
||||
+ sysInfo += QString( "<li><a href=\"file:%1\">" ).arg( htmlQuote(KGlobalSettings::documentPath()) )
|
||||
+ + i18n( "My Documents" ) + "</a></li>";
|
||||
+ sysInfo += QString( "<li><a href=\"file:%1\">" ).arg( htmlQuote(QDir::homeDirPath()) ) + i18n( "My Home Folder" ) + "</a></li>";
|
||||
+ sysInfo += QString( "<li><a href=\"file:%1\">" ).arg( htmlQuote(QDir::rootDirPath()) ) + i18n( "Root Folder" ) + "</a></li>";
|
||||
sysInfo += "<li><a href=\"remote:/\">" + i18n( "Network Folders" ) + "</a></li>";
|
||||
sysInfo += "</ul>";
|
||||
|
||||
// net info
|
||||
+ infoMessage( i18n( "Looking up network status..." ) );
|
||||
int state = netInfo();
|
||||
if (state > 1) { // assume no network manager / networkstatus
|
||||
sysInfo += "<h2 id=\"net\">" + i18n( "Network Status" ) + "</h2>";
|
||||
@@ -208,8 +196,6 @@
|
||||
sysInfo += "</ul>";
|
||||
}
|
||||
|
||||
- // CPU info
|
||||
- cpuInfo();
|
||||
if ( !m_info[CPU_MODEL].isNull() )
|
||||
{
|
||||
sysInfo += "<h2 id=\"cpu\">" + i18n( "CPU Information" ) + "</h2>";
|
||||
@@ -231,30 +217,17 @@
|
||||
}
|
||||
|
||||
// memory info
|
||||
+ infoMessage( i18n( "Looking for memory information..." ) );
|
||||
memoryInfo();
|
||||
sysInfo += "<h2 id=\"memory\">" + i18n( "Memory Information" ) + "</h2>";
|
||||
sysInfo += "<table>";
|
||||
sysInfo += "<tr><td>" + i18n( "Total memory (RAM):" ) + "</td><td>" + m_info[MEM_TOTALRAM] + "</td></tr>";
|
||||
sysInfo += "<tr><td>" + i18n( "Free memory:" ) + "</td><td>" + m_info[MEM_FREERAM] + "</td></tr>";
|
||||
dummy = i18n( "Used Memory" );
|
||||
- sysInfo += "<tr><td>" + i18n( "Total Swap:" ) + "</td><td>" + m_info[MEM_TOTALSWAP] + "</td></tr>";
|
||||
- sysInfo += "<tr><td>" + i18n( " Free Swap:" ) + "</td><td>" + m_info[MEM_FREESWAP] + "</td></tr>";
|
||||
+ dummy += "<tr><td>" + i18n( "Total swap:" ) + "</td><td>" + m_info[MEM_TOTALSWAP] + "</td></tr>";
|
||||
+ sysInfo += "<tr><td>" + i18n( "Free swap:" ) + "</td><td>" + m_info[MEM_FREESWAP] + "</td></tr>";
|
||||
sysInfo += "</table>";
|
||||
|
||||
- // hw info
|
||||
- if (!m_info[TYPE].isNull() || !m_info[MANUFACTURER].isNull() || !m_info[PRODUCT].isNull()
|
||||
- || !m_info[BIOSVENDOR].isNull() || !m_info[ BIOSVERSION ].isNull())
|
||||
- {
|
||||
- sysInfo += "<h2 id=\"hwinfo\">" +i18n( "Hardware Information" ) + "</h2>";
|
||||
- sysInfo += "<table>";
|
||||
- sysInfo += "<tr><td>" + i18n( "Type:" ) + "</td><td>" + m_info[ TYPE ] + "</td></tr>";
|
||||
- sysInfo += "<tr><td>" + i18n( "Vendor:" ) + "</td><td>" + m_info[ MANUFACTURER ] + "</td></tr>";
|
||||
- sysInfo += "<tr><td>" + i18n( "Model:" ) + "</td><td>" + m_info[ PRODUCT ] + "</td></tr>";
|
||||
- sysInfo += "<tr><td>" + i18n( "Bios Vendor:" ) + "</td><td>" + m_info[ BIOSVENDOR ] + "</td></tr>";
|
||||
- sysInfo += "<tr><td>" + i18n( "Bios Version:" ) + "</td><td>" + m_info[ BIOSVERSION ] + "</td></tr>";
|
||||
- sysInfo += "</table>";
|
||||
- }
|
||||
-
|
||||
sysInfo += "</div>";
|
||||
|
||||
// Send the data
|
||||
@@ -278,11 +251,11 @@
|
||||
unsigned long int val = 0;
|
||||
if ( sscanf( b + strlen( key ), ": %lu", &val ) != 1 )
|
||||
return 0;
|
||||
- kdDebug() << "scan_one " << key << " " << val << endl;
|
||||
+ kdDebug(1242) << "scan_one " << key << " " << val << endl;
|
||||
return val;
|
||||
}
|
||||
|
||||
-static unsigned long int calculateFreeRam()
|
||||
+static Q_UINT64 calculateFreeRam()
|
||||
{
|
||||
FILE *fd = fopen( "/proc/meminfo", "rt" );
|
||||
if ( !fd )
|
||||
@@ -291,10 +264,10 @@
|
||||
QTextIStream is( fd );
|
||||
QString MemInfoBuf = is.read();
|
||||
|
||||
- unsigned long int MemFree = scan_one( MemInfoBuf.latin1(), "MemFree" );
|
||||
- unsigned long int Buffers = scan_one( MemInfoBuf.latin1(), "Buffers" );
|
||||
- unsigned long int Cached = scan_one( MemInfoBuf.latin1(), "Cached" );
|
||||
- unsigned long int Slab = scan_one( MemInfoBuf.latin1(), "Slab" );
|
||||
+ Q_UINT64 MemFree = scan_one( MemInfoBuf.latin1(), "MemFree" );
|
||||
+ Q_UINT64 Buffers = scan_one( MemInfoBuf.latin1(), "Buffers" );
|
||||
+ Q_UINT64 Cached = scan_one( MemInfoBuf.latin1(), "Cached" );
|
||||
+ Q_UINT64 Slab = scan_one( MemInfoBuf.latin1(), "Slab" );
|
||||
fclose( fd );
|
||||
|
||||
MemFree += Cached + Buffers + Slab;
|
||||
@@ -310,19 +283,19 @@
|
||||
|
||||
if ( retval !=-1 )
|
||||
{
|
||||
- const int mem_unit = info.mem_unit;
|
||||
+ Q_UINT64 mem_unit = info.mem_unit;
|
||||
|
||||
- m_info[MEM_TOTALRAM] = formattedUnit( info.totalram * mem_unit );
|
||||
- unsigned long int totalFree = calculateFreeRam() * 1024;
|
||||
- kdDebug() << "total " << totalFree << " free " << info.freeram << " unit " << mem_unit << endl;
|
||||
+ m_info[MEM_TOTALRAM] = formattedUnit( Q_UINT64(info.totalram) * mem_unit );
|
||||
+ Q_UINT64 totalFree = calculateFreeRam() * 1024;
|
||||
+ kdDebug(1242) << "total " << totalFree << " free " << info.freeram << " unit " << mem_unit << endl;
|
||||
if ( totalFree > info.freeram * info.mem_unit || true )
|
||||
- m_info[MEM_FREERAM] = i18n("%1 (+ %2 Caches)").arg(formattedUnit( info.freeram * mem_unit ))
|
||||
+ m_info[MEM_FREERAM] = i18n("%1 (+ %2 Caches)").arg(formattedUnit( Q_UINT64(info.freeram) * mem_unit ))
|
||||
.arg( formattedUnit( totalFree - info.freeram * mem_unit ));
|
||||
else
|
||||
- m_info[MEM_FREERAM] = formattedUnit( info.freeram * mem_unit );
|
||||
+ m_info[MEM_FREERAM] = formattedUnit( Q_UINT64(info.freeram) * mem_unit );
|
||||
|
||||
- m_info[MEM_TOTALSWAP] = formattedUnit( info.totalswap * mem_unit );
|
||||
- m_info[MEM_FREESWAP] = formattedUnit( info.freeswap * mem_unit );
|
||||
+ m_info[MEM_TOTALSWAP] = formattedUnit( Q_UINT64(info.totalswap) * mem_unit );
|
||||
+ m_info[MEM_FREESWAP] = formattedUnit( Q_UINT64(info.freeswap) * mem_unit );
|
||||
|
||||
m_info[SYSTEM_UPTIME] = convertSeconds( info.uptime );
|
||||
}
|
||||
@@ -346,6 +319,7 @@
|
||||
m_info[CPU_TEMP] =
|
||||
readFromFile(QString("/proc/acpi/thermal_zone/%1/temperature").arg(names[i]), "temperature", ":");
|
||||
m_info[CPU_TEMP] = m_info[CPU_TEMP].stripWhiteSpace();
|
||||
+ m_info[CPU_TEMP].replace(" C",QString::fromUtf8("°C"));
|
||||
if (!m_info[CPU_TEMP].isEmpty())
|
||||
break;
|
||||
}
|
||||
@@ -355,9 +329,12 @@
|
||||
m_info[CPU_MODEL] = readFromFile( "/proc/cpuinfo", "cpu", ":" );
|
||||
}
|
||||
|
||||
+
|
||||
QString kio_sysinfoProtocol::diskInfo()
|
||||
{
|
||||
- QString result = "<table>";
|
||||
+ QString result = "<table><tr><th>" + i18n( "Device" ) + "</th><th>" + i18n( "Filesystem" ) + "</th><th>" +
|
||||
+ i18n( "Total space" ) + "</th><th>" + i18n( "Available space" ) + "</th></tr>";
|
||||
+
|
||||
if ( fillMediaDevices() )
|
||||
{
|
||||
for ( QValueList<DiskInfo>::ConstIterator it = m_devices.constBegin(); it != m_devices.constEnd(); ++it )
|
||||
@@ -365,74 +342,72 @@
|
||||
QString tooltip = i18n("Press the right mouse button for more options like Mount or Eject");
|
||||
|
||||
DiskInfo di = ( *it );
|
||||
- QString label = di.userLabel.isEmpty() ? di.label : di.userLabel;
|
||||
+ unsigned int percent = 0;
|
||||
+ Q_UINT64 usage = di.total - di.avail;
|
||||
+ if (di.total)
|
||||
+ percent = usage / ( di.total / 100);
|
||||
+
|
||||
+ KURL media;
|
||||
+ media.setProtocol("media");
|
||||
+ media.setPath("/" + di.name);
|
||||
+
|
||||
+ result += QString( "<tr><td>%1 <a href=\"%2\" title=\"%7\">%3</a></td><td>%4</td><td>%5</td><td>%6</td></tr>\n" ).
|
||||
+ arg( icon( di.iconName ) ).arg( media.htmlURL() ).arg( htmlQuote(di.label) ).arg( di.fsType ).
|
||||
+ arg( di.total ? formattedUnit( di.total) : QString::null).arg(di.mounted ?
|
||||
+ formattedUnit (di.avail ) : QString::null).arg( htmlQuote(tooltip) );
|
||||
+ if (di.mounted) {
|
||||
+ QColor c;
|
||||
+ c.setHsv(100-percent, 180, 230);
|
||||
+ result += QString("<tr><td colspan=\"4\" class=\"bar\" width=\"100%\">"
|
||||
+ "<div class=\"filled\" style=\"width: %1%; height: 1em; background-color: %3\">"
|
||||
+ "%2</div></td></tr>\n")
|
||||
+ .arg(percent).arg(formattedUnit(usage).replace(" ", " ")).arg(c.name());
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ else // fall back to fstab parsing
|
||||
+ {
|
||||
+ FILE * fp;
|
||||
+ if ( !( fp = setmntent( "/etc/fstab", "r" ) ) )
|
||||
+ {
|
||||
+ kdDebug(1242) << k_funcinfo << "Failed to open /etc/fstab" << endl;
|
||||
+ return QString::null;
|
||||
+ }
|
||||
+
|
||||
+#define FS_NAME mnt_ent->mnt_fsname // device-name
|
||||
+#define FS_FILE mnt_ent->mnt_dir // mount-point
|
||||
+#define FS_TYPE mnt_ent->mnt_type // fs-type
|
||||
+
|
||||
+ struct statfs sfs;
|
||||
+ struct mntent *mnt_ent;
|
||||
+ unsigned long long total, avail;
|
||||
|
||||
- unsigned long long usage,percent,peer;
|
||||
- usage = di.total - di.avail;
|
||||
- peer = di.total / 100;
|
||||
-
|
||||
- peer == 0 ? percent = 0 : percent = usage / peer;
|
||||
-
|
||||
- if (percent < 20) {
|
||||
- result += QString( "<tr>"
|
||||
- " <td>%1</td>"
|
||||
- " <td width=\"90%\">"
|
||||
- " <table width=\"100%\">"
|
||||
- " <tr>"
|
||||
- " <a href=\"media:/%2\" title=\"%3\">%4</a> <b class=\"disk_text_color\"> [%5]"
|
||||
- " " + i18n("Total") + ": <b>%6</b> " + i18n("Available") + ": <b>%7</b> </b>"
|
||||
- " </td>"
|
||||
- " <td width=\"40%\" class=\"bar\">"
|
||||
- " <div style=\"width: %8%; height:10px;\"></div><span style=\"float:left; padding-top:2px\"> %9 </span>"
|
||||
- " </tr>"
|
||||
- " </table>"
|
||||
- " </td>"
|
||||
- "</tr>"
|
||||
- "<tr></tr>" ).
|
||||
-
|
||||
- arg( icon( di.iconName, 32 ) ).
|
||||
- arg( di.name ).
|
||||
- arg( tooltip).
|
||||
- arg( label ).
|
||||
- arg( di.fsType ).
|
||||
- arg( formattedUnit( di.total,0 ) ).
|
||||
- arg( formattedUnit( di.avail,0 ) ).
|
||||
- arg( di.mounted ? percent : 0).
|
||||
- arg( di.mounted ? formattedUnit( usage ) : QString::null );
|
||||
-
|
||||
- }
|
||||
-
|
||||
- else {
|
||||
-
|
||||
- result += QString( "<tr>"
|
||||
- " <td>%1</td>"
|
||||
- " <td width=\"90%\">"
|
||||
- " <table width=\"100%\">"
|
||||
- " <tr>"
|
||||
- " <a href=\"media:/%2\" title=\"%3\">%4</a> <b class=\"disk_text_color\"> [%5]"
|
||||
- " " + i18n("Total") + ": <b>%6</b> " + i18n("Available") + ": <b>%7</b> </b>"
|
||||
- " </td>"
|
||||
- " <td width=\"40%\" class=\"bar\">"
|
||||
- " <div style=\"width: %8%; height:10px;\">%9 </div>"
|
||||
- " </tr>"
|
||||
- " </table>"
|
||||
- " </td>"
|
||||
- "</tr>"
|
||||
- "<tr></tr>" ).
|
||||
-
|
||||
- arg( icon( di.iconName, 32 ) ).
|
||||
- arg( di.name ).
|
||||
- arg( tooltip).
|
||||
- arg( label ).
|
||||
- arg( di.fsType ).
|
||||
- arg( formattedUnit( di.total,0 ) ).
|
||||
- arg( formattedUnit( di.avail,0 ) ).
|
||||
- arg( di.mounted ? percent : 0).
|
||||
- arg( di.mounted ? formattedUnit( usage ) : QString::null );
|
||||
- }
|
||||
+ while ( ( mnt_ent = getmntent( fp ) ) != NULL )
|
||||
+ {
|
||||
+ total = avail = 0;
|
||||
+ if ( statfs( FS_FILE, &sfs ) == 0 )
|
||||
+ {
|
||||
+ total = ( unsigned long long )sfs.f_blocks * sfs.f_bsize;
|
||||
+ if ( total > 0 && strcmp( FS_TYPE, "subdomainfs" ) != 0 ) // discard empty or otherwise strange devices
|
||||
+ {
|
||||
+ avail = ( unsigned long long )( getuid() ? sfs.f_bavail : sfs.f_bfree ) * sfs.f_bsize;
|
||||
+ int lastSlash = QString( FS_NAME ).findRev( '/' );
|
||||
+ QString deviceName = lastSlash != -1 ? QString( FS_NAME ).mid( lastSlash + 1 ) : QString( FS_NAME );
|
||||
+ //kdDebug(1242) << k_funcinfo << "Device name: " << deviceName << endl;
|
||||
+ QString model = deviceName.left( deviceName.length() - 1 );
|
||||
+ model = readFromFile( "/proc/ide/" + model + "/model" );
|
||||
+ QString devIcon = icon( iconForDevice( deviceName ), KIcon::SizeSmall );
|
||||
+ result += QString( "<tr><td>%1 <a href=\"file:%2\" title=\"%7\">%3</a></td><td>%4</td><td>%5</td><td>%6</td></tr>" )
|
||||
+ .arg( devIcon ).arg( FS_FILE ).arg( FS_FILE ).arg( FS_TYPE ).arg( formattedUnit( total ) )
|
||||
+ .arg( formattedUnit( avail ) ).arg( model );
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
+ endmntent( fp );
|
||||
}
|
||||
+
|
||||
result += "</table>";
|
||||
+
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -442,12 +417,12 @@
|
||||
// query kded.networkstatus.status(QString host)
|
||||
DCOPRef nsd( "kded", "networkstatus" );
|
||||
nsd.setDCOPClient( m_dcopClient );
|
||||
- DCOPReply reply = nsd.call( "status", QString( "www.google.com" ) );
|
||||
+ DCOPReply reply = nsd.call( "status", QString( "www.mandriva.com" ) );
|
||||
|
||||
if ( reply.isValid() )
|
||||
return reply;
|
||||
|
||||
- kdDebug() << k_funcinfo << "Reply is invalid" << endl;
|
||||
+ kdDebug(1242) << k_funcinfo << "Reply is invalid" << endl;
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -539,7 +514,6 @@
|
||||
#endif
|
||||
}
|
||||
|
||||
-#define INFO_DRI "/proc/dri/0/name"
|
||||
|
||||
bool kio_sysinfoProtocol::glInfo()
|
||||
{
|
||||
@@ -621,7 +595,6 @@
|
||||
return true;
|
||||
}
|
||||
|
||||
-
|
||||
QString kio_sysinfoProtocol::netStatus( int code ) const
|
||||
{
|
||||
if ( code == 1 || code == 2 )
|
||||
@@ -641,7 +614,8 @@
|
||||
QString kio_sysinfoProtocol::icon( const QString & name, int size ) const
|
||||
{
|
||||
QString path = KGlobal::iconLoader()->iconPath( name, -size );
|
||||
- return QString( "<img src=\"file:%1\" width=\"%2\" height=\"%3\" valign=\"center\"/>" ).arg( path ).arg( size ).arg( size );
|
||||
+ return QString( "<img src=\"file:%1\" width=\"%2\" height=\"%3\" valign=\"bottom\"/>" ).arg(
|
||||
+ htmlQuote(path) ).arg( size ).arg( size );
|
||||
}
|
||||
|
||||
QString kio_sysinfoProtocol::iconForDevice( const QString & name ) const
|
||||
@@ -659,7 +633,6 @@
|
||||
|
||||
void kio_sysinfoProtocol::osInfo()
|
||||
{
|
||||
- FILE *fp;
|
||||
struct utsname uts;
|
||||
uname( &uts );
|
||||
m_info[ OS_SYSNAME ] = uts.sysname;
|
||||
@@ -670,14 +643,8 @@
|
||||
|
||||
m_info[ OS_USER ] = KUser().loginName();
|
||||
|
||||
- if((fp =fopen ("/etc/lsb-release", "r"))==NULL)
|
||||
- m_info[ OS_SYSTEM ] = readFromFile( "/etc/issue" );
|
||||
- else
|
||||
- { fclose(fp);
|
||||
- m_info[ OS_SYSTEM ] = readFromFile( "/etc/lsb-release", "DISTRIB_DESCRIPTION", "=" );
|
||||
- m_info[ OS_VERSION ] = readFromFile( "/etc/lsb-release", "DISTRIB_CODENAME", "=" );
|
||||
- }
|
||||
-
|
||||
+ m_info[ OS_SYSTEM ] = readFromFile( "/etc/mandriva-release" );
|
||||
+ m_info[ OS_SYSTEM ].replace("X86-64","x86_64");
|
||||
}
|
||||
|
||||
static const KCmdLineOptions options[] =
|
||||
@@ -698,10 +665,10 @@
|
||||
KCmdLineArgs::addCmdLineOptions( options );
|
||||
KApplication app( false, true );
|
||||
|
||||
- kdDebug(7101) << "*** Starting kio_sysinfo " << endl;
|
||||
+ kdDebug(1242) << "*** Starting kio_sysinfo " << endl;
|
||||
|
||||
if (argc != 4) {
|
||||
- kdDebug(7101) << "Usage: kio_sysinfo protocol domain-socket1 domain-socket2" << endl;
|
||||
+ kdDebug(1242) << "Usage: kio_sysinfo protocol domain-socket1 domain-socket2" << endl;
|
||||
exit(-1);
|
||||
}
|
||||
|
||||
@@ -710,7 +677,7 @@
|
||||
kio_sysinfoProtocol slave( args->arg(1), args->arg(2));
|
||||
slave.dispatchLoop();
|
||||
|
||||
- kdDebug(7101) << "*** kio_sysinfo Done" << endl;
|
||||
+ kdDebug(1242) << "*** kio_sysinfo Done" << endl;
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
@@ -723,15 +690,15 @@
|
||||
if ( devices.isEmpty() )
|
||||
return false;
|
||||
|
||||
- kdDebug() << devices << endl;
|
||||
+ kdDebug(1242) << devices << endl;
|
||||
|
||||
m_devices.clear();
|
||||
|
||||
LibHalContext *m_halContext = libhal_ctx_new();
|
||||
if (!m_halContext)
|
||||
{
|
||||
- kdDebug(1219) << "Failed to initialize HAL!" << endl;
|
||||
- return false;
|
||||
+ kdDebug(1242) << "Failed to initialize HAL!" << endl;
|
||||
+ return false;
|
||||
}
|
||||
|
||||
DBusError error;
|
||||
@@ -786,30 +753,26 @@
|
||||
struct statfs sfs;
|
||||
if ( di.mounted && statfs( QFile::encodeName( di.mountPoint ), &sfs ) == 0 )
|
||||
{
|
||||
- di.total = ( unsigned long long ) sfs.f_blocks * sfs.f_bsize;
|
||||
+ di.total = ( unsigned long long )sfs.f_blocks * sfs.f_bsize;
|
||||
di.avail = ( unsigned long long )( getuid() ? sfs.f_bavail : sfs.f_bfree ) * sfs.f_bsize;
|
||||
} else if (m_halContext && di.id.startsWith("/org/freedesktop/Hal/" ) )
|
||||
- {
|
||||
- dbus_error_init(&error);
|
||||
- di.total = libhal_device_get_property_uint64(m_halContext, di.id.latin1(), "volume.size", &error);
|
||||
- if (dbus_error_is_set(&error))
|
||||
- di.total = 0;
|
||||
- }
|
||||
+ {
|
||||
+ dbus_error_init(&error);
|
||||
+ di.total = libhal_device_get_property_uint64(m_halContext, di.id.latin1(), "volume.size", &error);
|
||||
+ if (dbus_error_is_set(&error))
|
||||
+ di.total = 0;
|
||||
+ }
|
||||
|
||||
- di.model = libhal_device_get_property_string( m_halContext, di.id.latin1( ), "block.storage_device", &error );
|
||||
- di.model = libhal_device_get_property_string( m_halContext, di.model.latin1( ), "storage.model", &error );
|
||||
+ // guess the model
|
||||
+ QString ideName = di.name;
|
||||
+ ideName.truncate( 3 );
|
||||
+ di.model = readFromFile( "/proc/ide/" + ideName + "/model" );
|
||||
|
||||
- ++it; // skip separator
|
||||
+ ++it; // skip separator
|
||||
|
||||
- m_devices.append( di );
|
||||
+ m_devices.append( di );
|
||||
}
|
||||
|
||||
- m_info[PRODUCT ] = libhal_device_get_property_string( m_halContext, "/org/freedesktop/Hal/devices/computer", "smbios.system.product", &error );
|
||||
- m_info[MANUFACTURER ] = libhal_device_get_property_string( m_halContext, "/org/freedesktop/Hal/devices/computer", "smbios.system.manufacturer", &error );
|
||||
- m_info[TYPE] = libhal_device_get_property_string( m_halContext, "/org/freedesktop/Hal/devices/computer", "smbios.chassis.type", &error );
|
||||
- m_info[BIOSVENDOR] = libhal_device_get_property_string( m_halContext, "/org/freedesktop/Hal/devices/computer", "smbios.bios.vendor", &error );
|
||||
- m_info[BIOSVERSION] = libhal_device_get_property_string( m_halContext, "/org/freedesktop/Hal/devices/computer", "smbios.bios.version", &error );
|
||||
-
|
||||
libhal_ctx_free(m_halContext);
|
||||
|
||||
return true;
|
||||
diff -u -r kio-sysinfo-1.8.2/src/sysinfo.h kio-sysinfo-10.3/src/sysinfo.h
|
||||
--- kio-sysinfo-1.8.2/src/sysinfo.h 2007-08-21 08:13:36.000000000 -0300
|
||||
+++ kio-sysinfo-10.3/src/sysinfo.h 2007-08-14 13:10:29.000000000 -0300
|
||||
@@ -51,7 +51,7 @@
|
||||
QString iconName;
|
||||
|
||||
// own stuff
|
||||
- unsigned long long total, avail; // space on device
|
||||
+ Q_UINT64 total, avail; // space on device
|
||||
QString model; // physical device model (name)
|
||||
};
|
||||
|
||||
@@ -78,12 +78,11 @@
|
||||
MEM_FREERAM,
|
||||
MEM_TOTALSWAP,
|
||||
MEM_FREESWAP,
|
||||
- STEPPING, //speedstep
|
||||
SYSTEM_UPTIME, // in seconds
|
||||
CPU_MODEL,
|
||||
CPU_SPEED, // in MHz
|
||||
- CPU_CORES,
|
||||
- CPU_TEMP,
|
||||
+ CPU_CORES,
|
||||
+ CPU_TEMP,
|
||||
OS_SYSNAME, // man 2 uname
|
||||
OS_RELEASE,
|
||||
OS_VERSION,
|
||||
@@ -94,31 +93,16 @@
|
||||
GFX_VENDOR, // Display stuff
|
||||
GFX_MODEL,
|
||||
GFX_DRIVER,
|
||||
- SYSINFO_LAST,
|
||||
- PRODUCT,
|
||||
- MANUFACTURER,
|
||||
- TYPE,
|
||||
- BIOSVENDOR,
|
||||
- BIOSVERSION
|
||||
+ SYSINFO_LAST
|
||||
};
|
||||
|
||||
private:
|
||||
/**
|
||||
- * Read sysinfo from (proc) filesystem. The data is assumed to be separated by newlines, with key:value pairs
|
||||
- *
|
||||
- * @param filename file to read from
|
||||
- * @param info requested field (if empty, return the first line from the file)
|
||||
- * @param sep separator
|
||||
- * NOT USED YET
|
||||
- */
|
||||
- // QString readFromFile( const QString & filename, const QString & info = QString::null, const char * sep = 0 ) const;
|
||||
-
|
||||
- /**
|
||||
* Gather basic memory info
|
||||
*/
|
||||
void memoryInfo();
|
||||
|
||||
- /**
|
||||
+ /**
|
||||
* Gather CPU info
|
||||
*/
|
||||
void cpuInfo();
|
||||
diff -u -r kio-sysinfo-1.8.2/admin/acinclude.m4.in kio-sysinfo-10.3/admin/acinclude.m4.in
|
||||
--- kio-sysinfo-1.8.2/admin/acinclude.m4.in 2006-08-31 15:56:03.000000000 -0300
|
||||
+++ kio-sysinfo-10.3/admin/acinclude.m4.in 2007-03-19 13:45:09.000000000 -0300
|
||||
@@ -983,7 +983,7 @@
|
||||
X_INCLUDES="-I$x_includes"
|
||||
fi
|
||||
|
||||
-if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE; then
|
||||
+if test -z "$kde_x_libraries" || test "x$kde_x_libraries" = xNONE || test "$kde_x_libraries" = "/usr/lib"; then
|
||||
X_LDFLAGS=""
|
||||
x_libraries="/usr/lib"; dnl better than nothing :-
|
||||
else
|
||||
@@ -3198,7 +3198,7 @@
|
||||
case $host in
|
||||
*-*-linux-gnu)
|
||||
CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
|
||||
- CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts $CXXFLAGS"
|
||||
+ CXXFLAGS="-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wchar-subscripts $CXXFLAGS"
|
||||
KDE_CHECK_COMPILER_FLAG(Wmissing-format-attribute, [CXXFLAGS="$CXXFLAGS -Wformat-security -Wmissing-format-attribute"])
|
||||
KDE_CHECK_C_COMPILER_FLAG(Wmissing-format-attribute, [CFLAGS="$CFLAGS -Wformat-security -Wmissing-format-attribute"])
|
||||
;;
|
||||
@@ -4624,12 +4624,14 @@
|
||||
|
||||
AC_DEFUN([KDE_CHECK_PYTHON],
|
||||
[
|
||||
- KDE_CHECK_PYTHON_INTERN("2.4",
|
||||
- [KDE_CHECK_PYTHON_INTERN("2.3",
|
||||
- [KDE_CHECK_PYTHON_INTERN("2.2",
|
||||
- [KDE_CHECK_PYTHON_INTERN("2.1",
|
||||
- [KDE_CHECK_PYTHON_INTERN("2.0",
|
||||
- [KDE_CHECK_PYTHON_INTERN($1, $2) ])
|
||||
+ KDE_CHECK_PYTHON_INTERN("2.5",
|
||||
+ [KDE_CHECK_PYTHON_INTERN("2.4",
|
||||
+ [KDE_CHECK_PYTHON_INTERN("2.3",
|
||||
+ [KDE_CHECK_PYTHON_INTERN("2.2",
|
||||
+ [KDE_CHECK_PYTHON_INTERN("2.1",
|
||||
+ [KDE_CHECK_PYTHON_INTERN("2.0",
|
||||
+ [KDE_CHECK_PYTHON_INTERN($1, $2) ])
|
||||
+ ])
|
||||
])
|
||||
])
|
||||
])
|
||||
@@ -5213,9 +5215,10 @@
|
||||
for dir in $javadirs; do
|
||||
dnl Check for the java executable
|
||||
if test -x "$dir/java"; then
|
||||
+ sane_path=$(cd $dir; /bin/pwd)
|
||||
dnl And also check for a libjvm.so somewhere under there
|
||||
dnl Since we have to go to the parent dir, /usr/bin is excluded, /usr is too big.
|
||||
- if test "$dir" != "/usr/bin"; then
|
||||
+ if test "$sane_path" != "/usr/bin"; then
|
||||
libjvmdir=`find $dir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
|
||||
if test ! -f $libjvmdir/libjvm.so; then continue; fi
|
||||
jredirs="$jredirs $dir"
|
||||
Somente em kio-sysinfo-1.8.2/admin: cvs-clean.pl
|
||||
diff -u -r kio-sysinfo-1.8.2/admin/cvs.sh kio-sysinfo-10.3/admin/cvs.sh
|
||||
--- kio-sysinfo-1.8.2/admin/cvs.sh 2006-08-31 15:56:03.000000000 -0300
|
||||
+++ kio-sysinfo-10.3/admin/cvs.sh 2007-05-14 04:16:15.000000000 -0300
|
||||
@@ -68,7 +68,7 @@
|
||||
echo "*** KDE requires automake $required_automake_version"
|
||||
exit 1
|
||||
;;
|
||||
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*)
|
||||
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
|
||||
echo "*** $AUTOMAKE_STRING found."
|
||||
UNSERMAKE=no
|
||||
;;
|
||||
@@ -316,7 +316,7 @@
|
||||
fi
|
||||
fi
|
||||
if test -z "$VERSION" || test "$VERSION" = "@VERSION@"; then
|
||||
- VERSION="\"3.5.4\""
|
||||
+ VERSION="\"3.5.7\""
|
||||
fi
|
||||
if test -z "$modulename" || test "$modulename" = "@MODULENAME@"; then
|
||||
modulename=`pwd`;
|
||||
diff -u -r kio-sysinfo-1.8.2/admin/detect-autoconf.pl kio-sysinfo-10.3/admin/detect-autoconf.pl
|
||||
--- kio-sysinfo-1.8.2/admin/detect-autoconf.pl 2006-08-31 15:56:03.000000000 -0300
|
||||
+++ kio-sysinfo-10.3/admin/detect-autoconf.pl 2007-08-14 10:26:09.000000000 -0300
|
||||
@@ -46,6 +46,8 @@
|
||||
|
||||
($version) = $file =~ /$prefix\/$program-?(.*)$/;
|
||||
$version =~ s/-|\.//g;
|
||||
+ # Don't check the -wrapper ones
|
||||
+ next if $version eq "wrapper";
|
||||
|
||||
# Special case some programs to make sure it has a minimum version.
|
||||
if (not $version and exists $minimumVersions{$program})
|
||||
Somente em kio-sysinfo-1.8.2/admin: detect-autoconf.sh
|
||||
diff -u -r kio-sysinfo-1.8.2/admin/libtool.m4.in kio-sysinfo-10.3/admin/libtool.m4.in
|
||||
--- kio-sysinfo-1.8.2/admin/libtool.m4.in 2006-08-31 15:56:03.000000000 -0300
|
||||
+++ kio-sysinfo-10.3/admin/libtool.m4.in 2007-04-23 16:19:55.000000000 -0300
|
||||
@@ -1424,7 +1424,7 @@
|
||||
libsuff=
|
||||
if test "x$LINUX_64_MODE" = x64; then
|
||||
# Some platforms are per default 64-bit, so there's no /lib64
|
||||
- if test -d /lib64; then
|
||||
+ if test -d /lib64 -a ! -h /lib64; then
|
||||
libsuff=64
|
||||
fi
|
||||
fi
|
||||
|
Before Width: | Height: | Size: 4.5 KiB |
@ -1,10 +0,0 @@
|
||||
--- klamav-0.41.1/src/freshklam.cpp.pwd-echo 2007-07-24 22:51:54.000000000 +0300
|
||||
+++ klamav-0.41.1/src/freshklam.cpp 2007-11-07 15:53:51.000000000 +0200
|
||||
@@ -225,6 +225,7 @@ Freshklam::Freshklam(QWidget *parent, co
|
||||
//proxy_pass_label->setFixedSize(proxy_pass_label->sizeHint());
|
||||
proxy_dir_layout->addWidget(proxy_pass_label,1,3);
|
||||
proxyPass = new KLineEdit(proxy_hlp);
|
||||
+ proxyPass->setEchoMode(KLineEdit::Password);
|
||||
proxy_dir_layout->addWidget(proxyPass,1,4);
|
||||
proxyPass->setText(proxyPassText);
|
||||
|
||||
@ -1,343 +0,0 @@
|
||||
--- src/specialfiletypes.ui.small 2008-03-29 03:37:21.000000000 +0100
|
||||
+++ src/specialfiletypes.ui 2008-03-29 03:37:27.000000000 +0100
|
||||
@@ -8,7 +8,7 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
- <width>399</width>
|
||||
+ <width>540</width>
|
||||
<height>385</height>
|
||||
</rect>
|
||||
</property>
|
||||
@@ -34,7 +34,7 @@
|
||||
<rect>
|
||||
<x>20</x>
|
||||
<y>30</y>
|
||||
- <width>330</width>
|
||||
+ <width>480</width>
|
||||
<height>210</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
||||
--- src/archivelimits.ui.small 2008-03-29 03:45:04.000000000 +0100
|
||||
+++ src/archivelimits.ui 2008-03-29 03:46:18.000000000 +0100
|
||||
@@ -8,7 +8,7 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
- <width>388</width>
|
||||
+ <width>474</width>
|
||||
<height>377</height>
|
||||
</rect>
|
||||
</property>
|
||||
@@ -46,9 +46,9 @@
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
- <x>11</x>
|
||||
- <y>11</y>
|
||||
- <width>366</width>
|
||||
+ <x>10</x>
|
||||
+ <y>10</y>
|
||||
+ <width>430</width>
|
||||
<height>230</height>
|
||||
</rect>
|
||||
</property>
|
||||
@@ -63,7 +63,7 @@
|
||||
<rect>
|
||||
<x>11</x>
|
||||
<y>34</y>
|
||||
- <width>350</width>
|
||||
+ <width>400</width>
|
||||
<height>160</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
||||
|
||||
--- src/autoscanoptions.ui.small 2008-03-29 03:51:50.000000000 +0100
|
||||
+++ src/autoscanoptions.ui 2008-03-29 03:52:28.000000000 +0100
|
||||
@@ -8,7 +8,7 @@
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
- <width>391</width>
|
||||
+ <width>529</width>
|
||||
<height>386</height>
|
||||
</rect>
|
||||
</property>
|
||||
@@ -48,7 +48,7 @@
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>10</y>
|
||||
- <width>370</width>
|
||||
+ <width>460</width>
|
||||
<height>180</height>
|
||||
</rect>
|
||||
</property>
|
||||
@@ -113,7 +113,7 @@
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>25</y>
|
||||
- <width>340</width>
|
||||
+ <width>440</width>
|
||||
<height>130</height>
|
||||
</rect>
|
||||
</property>
|
||||
|
||||
--- src/archivetypes.ui.old 2008-03-29 12:37:00.000000000 +0100
|
||||
+++ src/archivetypes.ui 2008-03-29 12:37:15.000000000 +0100
|
||||
@@ -35,7 +35,7 @@
|
||||
<x>20</x>
|
||||
<y>30</y>
|
||||
<width>330</width>
|
||||
- <height>284</height>
|
||||
+ <height>320</height>
|
||||
</rect>
|
||||
</property>
|
||||
<grid>
|
||||
@@ -44,7 +44,7 @@
|
||||
</property>
|
||||
<widget class="QCheckBox" row="6" column="0">
|
||||
<property name="name">
|
||||
- <cstring>kcfg_ScanDeb</cstring>
|
||||
+ <cstring>kcfg_ScanDeb</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Scan Deb files using</string>
|
||||
@@ -55,7 +55,7 @@
|
||||
</widget>
|
||||
<widget class="QCheckBox" row="5" column="0">
|
||||
<property name="name">
|
||||
- <cstring>kcfg_ScanJar</cstring>
|
||||
+ <cstring>kcfg_ScanJar</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Scan Jar files using</string>
|
||||
@@ -66,7 +66,7 @@
|
||||
</widget>
|
||||
<widget class="QCheckBox" row="7" column="0">
|
||||
<property name="name">
|
||||
- <cstring>kcfg_ScanTar</cstring>
|
||||
+ <cstring>kcfg_ScanTar</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Scan Tar files using</string>
|
||||
@@ -77,7 +77,7 @@
|
||||
</widget>
|
||||
<widget class="QCheckBox" row="4" column="0">
|
||||
<property name="name">
|
||||
- <cstring>kcfg_ScanLzh</cstring>
|
||||
+ <cstring>kcfg_ScanLzh</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Scan Lzh files using</string>
|
||||
@@ -88,12 +88,12 @@
|
||||
</widget>
|
||||
<widget class="KURLComboRequester" row="7" column="1">
|
||||
<property name="name">
|
||||
- <cstring>kcfg_TarUsing</cstring>
|
||||
+ <cstring>kcfg_TarUsing</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" row="3" column="0">
|
||||
<property name="name">
|
||||
- <cstring>kcfg_ScanZoo</cstring>
|
||||
+ <cstring>kcfg_ScanZoo</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Scan Zoo files using</string>
|
||||
@@ -104,22 +104,22 @@
|
||||
</widget>
|
||||
<widget class="KURLComboRequester" row="3" column="1">
|
||||
<property name="name">
|
||||
- <cstring>kcfg_ZooUsing</cstring>
|
||||
+ <cstring>kcfg_ZooUsing</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="KURLComboRequester" row="4" column="1">
|
||||
<property name="name">
|
||||
- <cstring>kcfg_LzhUsing</cstring>
|
||||
+ <cstring>kcfg_LzhUsing</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="KURLComboRequester" row="0" column="1">
|
||||
<property name="name">
|
||||
- <cstring>kcfg_ZipUsing</cstring>
|
||||
+ <cstring>kcfg_ZipUsing</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" row="1" column="0">
|
||||
<property name="name">
|
||||
- <cstring>kcfg_ScanRar</cstring>
|
||||
+ <cstring>kcfg_ScanRar</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Scan Rar files using</string>
|
||||
@@ -130,7 +130,7 @@
|
||||
</widget>
|
||||
<widget class="QCheckBox" row="0" column="0">
|
||||
<property name="name">
|
||||
- <cstring>kcfg_ScanZip</cstring>
|
||||
+ <cstring>kcfg_ScanZip</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Scan &Zip files using</string>
|
||||
@@ -141,27 +141,27 @@
|
||||
</widget>
|
||||
<widget class="KURLComboRequester" row="5" column="1">
|
||||
<property name="name">
|
||||
- <cstring>kcfg_JarUsing</cstring>
|
||||
+ <cstring>kcfg_JarUsing</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="KURLComboRequester" row="1" column="1">
|
||||
<property name="name">
|
||||
- <cstring>kcfg_RarUsing</cstring>
|
||||
+ <cstring>kcfg_RarUsing</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="KURLComboRequester" row="6" column="1">
|
||||
<property name="name">
|
||||
- <cstring>kcfg_DebUsing</cstring>
|
||||
+ <cstring>kcfg_DebUsing</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="KURLComboRequester" row="8" column="1">
|
||||
<property name="name">
|
||||
- <cstring>kcfg_TgzUsing</cstring>
|
||||
+ <cstring>kcfg_TgzUsing</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" row="8" column="0">
|
||||
<property name="name">
|
||||
- <cstring>kcfg_ScanTgz</cstring>
|
||||
+ <cstring>kcfg_ScanTgz</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Scan Tgz files using</string>
|
||||
@@ -172,12 +172,12 @@
|
||||
</widget>
|
||||
<widget class="KURLComboRequester" row="2" column="1">
|
||||
<property name="name">
|
||||
- <cstring>kcfg_ArjUsing</cstring>
|
||||
+ <cstring>kcfg_ArjUsing</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
<widget class="QCheckBox" row="2" column="0">
|
||||
<property name="name">
|
||||
- <cstring>kcfg_ScanArj</cstring>
|
||||
+ <cstring>kcfg_ScanArj</cstring>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Scan Arj files using</string>
|
||||
--- src/logoptions.ui.old 2008-03-29 12:46:38.000000000 +0100
|
||||
+++ src/logoptions.ui 2008-03-29 12:47:18.000000000 +0100
|
||||
@@ -38,7 +38,7 @@
|
||||
<rect>
|
||||
<x>12</x>
|
||||
<y>69</y>
|
||||
- <width>161</width>
|
||||
+ <width>330</width>
|
||||
<height>21</height>
|
||||
</rect>
|
||||
</property>
|
||||
@@ -48,13 +48,52 @@
|
||||
</widget>
|
||||
<widget class="QLayoutWidget">
|
||||
<property name="name">
|
||||
+ <cstring>layout5</cstring>
|
||||
+ </property>
|
||||
+ <property name="geometry">
|
||||
+ <rect>
|
||||
+ <x>12</x>
|
||||
+ <y>17</y>
|
||||
+ <width>350</width>
|
||||
+ <height>40</height>
|
||||
+ </rect>
|
||||
+ </property>
|
||||
+ <grid>
|
||||
+ <property name="name">
|
||||
+ <cstring>unnamed</cstring>
|
||||
+ </property>
|
||||
+ <widget class="QSpinBox" row="0" column="1">
|
||||
+ <property name="name">
|
||||
+ <cstring>kcfg_ExpireDays</cstring>
|
||||
+ </property>
|
||||
+ </widget>
|
||||
+ <widget class="QLabel" row="0" column="0">
|
||||
+ <property name="name">
|
||||
+ <cstring>MaxMBsEx</cstring>
|
||||
+ </property>
|
||||
+ <property name="text">
|
||||
+ <string>Expire events after</string>
|
||||
+ </property>
|
||||
+ </widget>
|
||||
+ <widget class="QLabel" row="0" column="2">
|
||||
+ <property name="name">
|
||||
+ <cstring>MaxMBsEx_2</cstring>
|
||||
+ </property>
|
||||
+ <property name="text">
|
||||
+ <string>day(s)</string>
|
||||
+ </property>
|
||||
+ </widget>
|
||||
+ </grid>
|
||||
+ </widget>
|
||||
+ <widget class="QLayoutWidget">
|
||||
+ <property name="name">
|
||||
<cstring>layout4</cstring>
|
||||
</property>
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>11</x>
|
||||
<y>91</y>
|
||||
- <width>300</width>
|
||||
+ <width>350</width>
|
||||
<height>210</height>
|
||||
</rect>
|
||||
</property>
|
||||
@@ -141,45 +180,6 @@
|
||||
</widget>
|
||||
</vbox>
|
||||
</widget>
|
||||
- <widget class="QLayoutWidget">
|
||||
- <property name="name">
|
||||
- <cstring>layout5</cstring>
|
||||
- </property>
|
||||
- <property name="geometry">
|
||||
- <rect>
|
||||
- <x>12</x>
|
||||
- <y>17</y>
|
||||
- <width>300</width>
|
||||
- <height>40</height>
|
||||
- </rect>
|
||||
- </property>
|
||||
- <grid>
|
||||
- <property name="name">
|
||||
- <cstring>unnamed</cstring>
|
||||
- </property>
|
||||
- <widget class="QSpinBox" row="0" column="1">
|
||||
- <property name="name">
|
||||
- <cstring>kcfg_ExpireDays</cstring>
|
||||
- </property>
|
||||
- </widget>
|
||||
- <widget class="QLabel" row="0" column="0">
|
||||
- <property name="name">
|
||||
- <cstring>MaxMBsEx</cstring>
|
||||
- </property>
|
||||
- <property name="text">
|
||||
- <string>Expire events after</string>
|
||||
- </property>
|
||||
- </widget>
|
||||
- <widget class="QLabel" row="0" column="2">
|
||||
- <property name="name">
|
||||
- <cstring>MaxMBsEx_2</cstring>
|
||||
- </property>
|
||||
- <property name="text">
|
||||
- <string>day(s)</string>
|
||||
- </property>
|
||||
- </widget>
|
||||
- </grid>
|
||||
- </widget>
|
||||
</widget>
|
||||
</widget>
|
||||
<layoutdefaults spacing="6" margin="11"/>
|
||||
@ -1,12 +0,0 @@
|
||||
diff -p -up klamav-0.46/src/klammail/clamdmail.c~ klamav-0.46/src/klammail/clamdmail.c
|
||||
--- klamav-0.46/src/klammail/clamdmail.c~ 2009-02-28 11:27:27.000000000 +0100
|
||||
+++ klamav-0.46/src/klammail/clamdmail.c 2009-03-14 17:16:32.000000000 +0100
|
||||
@@ -576,7 +576,7 @@ void startclamd(struct optstruct *opt)
|
||||
break;
|
||||
}
|
||||
}else{
|
||||
- fprintf(tmp,"DatabaseDirectory /usr/local/share/clamav\n");
|
||||
+ fprintf(tmp,"DatabaseDirectory /var/lib/clamav\n");
|
||||
}
|
||||
//fprintf(tmp,"ScanMail\n");
|
||||
if ((strstr(cl_retver(), "0.8")) || (strstr(cl_retver(), "0.7")))
|
||||
@ -1,33 +0,0 @@
|
||||
diff -p -up klamav-0.46/src/ctcron.cpp.gcc43 klamav-0.46/src/ctcron.cpp
|
||||
--- klamav-0.46/src/ctcron.cpp.gcc43 2009-02-28 11:27:27.000000000 +0100
|
||||
+++ klamav-0.46/src/ctcron.cpp 2009-03-14 16:57:40.000000000 +0100
|
||||
@@ -18,6 +18,7 @@
|
||||
#include "ctvariable.h"
|
||||
#include <pwd.h> // pwd, getpwnam(), getpwuid()
|
||||
#include <assert.h>
|
||||
+#include <stdlib.h> // system
|
||||
|
||||
#include <qfile.h>
|
||||
|
||||
diff -p -up klamav-0.46/src/ctunit.cpp.gcc43 klamav-0.46/src/ctunit.cpp
|
||||
--- klamav-0.46/src/ctunit.cpp.gcc43 2009-02-28 11:27:27.000000000 +0100
|
||||
+++ klamav-0.46/src/ctunit.cpp 2009-03-14 16:57:40.000000000 +0100
|
||||
@@ -18,6 +18,7 @@
|
||||
#include <stdlib.h> // sprintf
|
||||
#include <stdio.h> // sprintf
|
||||
#include <ctype.h> // tolower
|
||||
+#include <stdlib.h> // atoi
|
||||
|
||||
using namespace std;
|
||||
|
||||
diff -p -up klamav-0.46/src/ktview.cpp.gcc43 klamav-0.46/src/ktview.cpp
|
||||
--- klamav-0.46/src/ktview.cpp.gcc43 2009-02-28 11:27:27.000000000 +0100
|
||||
+++ klamav-0.46/src/ktview.cpp 2009-03-14 16:57:40.000000000 +0100
|
||||
@@ -20,6 +20,7 @@
|
||||
// #include <strstream.h>
|
||||
// #endif
|
||||
|
||||
+#include <stdlib.h> // system
|
||||
|
||||
#include <qfileinfo.h>
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
KLAMAV_DIR=${HOME}/.klamav
|
||||
|
||||
if [ ! -d ${KLAMAV_DIR}/database -o ! -d ${KLAMAV_DIR}/quarantine ]; then
|
||||
mkdir -p ${KLAMAV_DIR}/{database,quarantine}
|
||||
fi
|
||||
|
||||
if [ ! -f ${KLAMAV_DIR}/database/main.cvd -o ! -f ${KLAMAV_DIR}/database/daily.cvd ]; then
|
||||
cp -f /var/lib/clamav/* ${KLAMAV_DIR}/database
|
||||
fi
|
||||
|
||||
klamav-real
|
||||
@ -1,220 +0,0 @@
|
||||
Summary: KDE frontend for the Clam AntiVirus virus scanner
|
||||
Name: klamav
|
||||
Version: 0.46
|
||||
Release: %mkrel 4
|
||||
License: GPLv2+
|
||||
Group: File tools
|
||||
URL: http://sourceforge.net/projects/klamav/
|
||||
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-source.tar.gz
|
||||
Source1: klamav.sh
|
||||
Patch0: klamav-0.46-default-db-dir.diff
|
||||
Patch1: klamav-0.42-fix-window-size.patch
|
||||
Patch2: klamav-0.41.1-pwd-echo.patch
|
||||
Patch3: klamav-0.46-gcc43.patch
|
||||
BuildRequires: kdelibs-devel
|
||||
BuildRequires: clamav-devel >= 0.93
|
||||
BuildRequires: desktop-file-utils
|
||||
Requires: clamav >= 0.93
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
|
||||
%description
|
||||
KlamAV provides ClamAV protection for the KDE desktop. It includes
|
||||
'on access' scanning, manual scanning, quarantine management,
|
||||
downloading of updates, mail scanning, and automated installation.
|
||||
|
||||
%prep
|
||||
|
||||
%setup -qn %{name}-%{version}-source/%{name}-%{version}
|
||||
#patch0 -p1 -b .default_db_directory
|
||||
%patch1 -p0 -b .fix_window_size
|
||||
%patch2 -p1 -b .pwd-echo
|
||||
%patch3 -p1 -b .gcc43
|
||||
|
||||
%build
|
||||
%configure_kde3
|
||||
%make
|
||||
|
||||
%install
|
||||
rm -Rf %{buildroot}
|
||||
|
||||
%makeinstall_std
|
||||
|
||||
mkdir -p %{buildroot}/{%{_menudir},%{_miconsdir},%{_liconsdir}}
|
||||
|
||||
mkdir -p %{buildroot}%{_kde3_datadir}/applications/kde
|
||||
desktop-file-install --vendor='' --delete-original \
|
||||
--dir=%{buildroot}%{_kde3_datadir}/applications/kde \
|
||||
--remove-category="Application" \
|
||||
--add-category="Security" \
|
||||
%{buildroot}%{_kde3_datadir}/applnk/Utilities/klamav.desktop
|
||||
|
||||
|
||||
# Copy translated virus browser
|
||||
# Next release this shoul be made standard
|
||||
mv %{buildroot}%{_kde3_bindir}/klamav %{buildroot}%{_kde3_bindir}/klamav-real
|
||||
cp %SOURCE1 %{buildroot}%{_kde3_bindir}/klamav
|
||||
|
||||
%find_lang %{name} --with-html --all-name
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -Rf %{buildroot}
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
%attr (755,root,root) %{_kde3_bindir}/*
|
||||
%{_kde3_datadir}/apps/%{name}
|
||||
%{_kde3_iconsdir}/*/*/*/%{name}.png
|
||||
%{_kde3_datadir}/applications/kde/*.desktop
|
||||
%{_kde3_datadir}/apps/konqueror/servicemenus/klamav-dropdown.desktop
|
||||
%{_kde3_datadir}/config.kcfg/*.kcfg
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 22 2011 Tim Williams <tim@my-place.org.uk> 0.46-4mdv2010.2
|
||||
+ Rebuild for Trinity
|
||||
|
||||
* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 0.46-3mdv2010.1
|
||||
+ Rebuild for MDV 2010.1
|
||||
|
||||
* Tue Nov 17 2009 Tim Williams <tim@my-place.org.uk> 0.46-2mdv2010.0
|
||||
+ Rebuild for MDV 2010.0
|
||||
|
||||
* Sat Mar 14 2009 Buchan Milne <bgmilne@mandriva.org> 0.46-1mdv2009.1
|
||||
+ Revision: 355062
|
||||
- New version 0.46
|
||||
- drop vlamav 0.nf patch, fixed upstream
|
||||
- rediff patches
|
||||
|
||||
* Thu Sep 04 2008 Oden Eriksson <oeriksson@mandriva.com> 0.44-2mdv2009.0
|
||||
+ Revision: 280731
|
||||
- fix build against clamav-0.94 libs
|
||||
- rebuild against new clamav libs
|
||||
|
||||
* Sun Jul 06 2008 Funda Wang <fundawang@mandriva.org> 0.44-1mdv2009.0
|
||||
+ Revision: 232258
|
||||
- New version 0.44
|
||||
- switch to /opt
|
||||
- drop patch4 not needed
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
|
||||
|
||||
* Wed May 21 2008 Oden Eriksson <oeriksson@mandriva.com> 0.42-4mdv2009.0
|
||||
+ Revision: 209718
|
||||
- bump release
|
||||
- sync with fedora
|
||||
- rebuild
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- Fix some UI issues
|
||||
|
||||
* Sun Jan 20 2008 Funda Wang <fundawang@mandriva.org> 0.42-1mdv2008.1
|
||||
+ Revision: 155212
|
||||
- New version 0.42
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- rebuild
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
* Thu Aug 09 2007 Funda Wang <fundawang@mandriva.org> 0.41.1-2mdv2008.0
|
||||
+ Revision: 60769
|
||||
- drop old menu
|
||||
- New version 0.41.1
|
||||
|
||||
|
||||
* Sun Mar 04 2007 Emmanuel Andry <eandry@mandriva.org> 0.41-2mdv2007.0
|
||||
+ Revision: 131925
|
||||
- rebuild for new libclamav
|
||||
|
||||
* Sat Feb 24 2007 Tomasz Pawel Gajc <tpg@mandriva.org> 0.41-1mdv2007.1
|
||||
+ Revision: 125377
|
||||
- new version
|
||||
- use --disable-rpath
|
||||
- pass some other options into the %%configure
|
||||
- drop sources 2,4,5
|
||||
- use %%find_lang
|
||||
- some cleans in spec file
|
||||
|
||||
* Thu Dec 14 2006 Emmanuel Andry <eandry@mandriva.org> 0.39-2mdv2007.1
|
||||
+ Revision: 96844
|
||||
- remove support for version older than MDV10.1
|
||||
|
||||
* Thu Dec 14 2006 Emmanuel Andry <eandry@mandriva.org> 0.39-1mdv2007.1
|
||||
+ Revision: 96583
|
||||
- New version 0.39
|
||||
drop patches 1 2 3 4 5
|
||||
|
||||
+ Andreas Hasenack <andreas@mandriva.com>
|
||||
- renamed mdv to packages because mdv is too generic and it's hosting only packages anyway
|
||||
|
||||
+ Helio Chissini de Castro <helio@mandriva.com>
|
||||
- Fix for proxy cnofigurations. Not everyone use proxy with user and pwd.
|
||||
- Fixed media:/ or devices:/ patch
|
||||
- Added patch for translate html files. Still not the optimal solution, but
|
||||
works for current requirements
|
||||
- Added translation for .html about files
|
||||
- Fixded pt_BR translation. Patch will be submitted upstream
|
||||
- Added better ui handling by Gustavo Boiko <boiko@mandriva.com>, using media:/
|
||||
on KDE 3.5
|
||||
- No nrpoc compilation
|
||||
- Upload packages with OEM fixes
|
||||
- Created package structure for klamav.
|
||||
|
||||
* Tue Nov 22 2005 Laurent MONTEL <lmontel@mandriva.com> 0.32-1
|
||||
- 0.32
|
||||
|
||||
* Fri Nov 18 2005 Oden Eriksson <oeriksson@mandriva.com> 0.22.1-2mdk
|
||||
- rebuilt against openssl-0.9.8a
|
||||
|
||||
* Fri Aug 26 2005 Buchan Milne <bgmilne@linux-mandrake.com> 0.22.1-1mdk
|
||||
- New release 0.22.1
|
||||
|
||||
* Tue Jul 26 2005 Nicolas Lécureuil <neoclust@mandriva.org> 0.22-1mdk
|
||||
- New release 0.22
|
||||
|
||||
* Wed Jul 13 2005 Buchan Milne <bgmilne@linux-mandrake.com> 0.20.1-1mdk
|
||||
- New release 0.20.1
|
||||
|
||||
* Fri May 27 2005 Nicolas Lécureuil <neoclust@mandriva.org> 0.20-1mdk
|
||||
- 0.20
|
||||
|
||||
* Tue May 24 2005 Eskild Hustvedt <eskild@mandriva.org> 0.17.2-3mdk
|
||||
- Rebuild
|
||||
|
||||
* Fri Apr 29 2005 Nicolas Lécureuil <neoclust@mandriva.org> 0.17.2-2mdk
|
||||
- Fix BuildRequires
|
||||
|
||||
* Fri Apr 29 2005 Nicolas Lécureuil <neoclust@mandriva.org> 0.17.2-1mdk
|
||||
- 0.17.2
|
||||
|
||||
* Wed Apr 13 2005 Oden Eriksson <oeriksson@mandrakesoft.com> 0.17-1mdk
|
||||
- 0.17
|
||||
- rediff P0
|
||||
- nuke rpath
|
||||
|
||||
* Sat Apr 09 2005 Oden Eriksson <oeriksson@mandrakesoft.com> 0.12.1-1mdk
|
||||
- 0.12.1
|
||||
- use the %%mkrel macro
|
||||
- fix description
|
||||
- fix P0, in another place
|
||||
|
||||
* Sat Oct 16 2004 Lenny Cartier <lenny@mandrakesoft.com> 0.06-1mdk
|
||||
- 0.06
|
||||
|
||||
* Wed Sep 29 2004 Buchan Milne <bgmilne@linux-mandrake.com> 0.05-1mdk
|
||||
- first Mandrake package
|
||||
- p0 to use our clamav-db path
|
||||
|
||||
@ -1,84 +0,0 @@
|
||||
diff -Naur kmetabar.orig/src/kmetabar_widget.cpp kmetabar/src/kmetabar_widget.cpp
|
||||
--- kmetabar.orig/src/kmetabar_widget.cpp 2006-11-06 18:48:04.000000000 +0200
|
||||
+++ kmetabar/src/kmetabar_widget.cpp 2006-11-06 18:49:40.000000000 +0200
|
||||
@@ -141,7 +141,7 @@
|
||||
//connect(config_button, SIGNAL(clicked()), this, SLOT(slotShowConfigDialog()));
|
||||
|
||||
icon = new KURLLabel(main_frame_bottom);
|
||||
- icon->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
|
||||
+ //icon->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
|
||||
connect(icon, SIGNAL(leftClickedURL()), this, SLOT(slotShowPropertiesDialog()));
|
||||
|
||||
name_label = new KSqueezedTextLabel(main_frame_bottom);
|
||||
@@ -176,28 +176,28 @@
|
||||
top_action_frame->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
|
||||
|
||||
action1 = new KURLLabel(top_action_frame);
|
||||
- action1->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
|
||||
+ //action1->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
|
||||
action1->setAlignment ( Qt::AlignHCenter );
|
||||
connect (action1, SIGNAL(leftClickedURL()), this, SLOT(slotaction1()));
|
||||
connect (action1, SIGNAL(enteredURL(const QString&)), this, SLOT(slotMessage1(const QString&)));
|
||||
connect (action1, SIGNAL(leftURL()), this, SLOT(slotClearMsg()));
|
||||
|
||||
action2 = new KURLLabel(top_action_frame);
|
||||
- action2->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
|
||||
+ //action2->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
|
||||
action2->setAlignment ( Qt::AlignHCenter );
|
||||
connect (action2, SIGNAL(leftClickedURL()), this, SLOT(slotaction2()));
|
||||
connect (action2, SIGNAL(enteredURL(const QString&)), this, SLOT(slotMessage2(const QString&)));
|
||||
connect (action2, SIGNAL(leftURL()), this, SLOT(slotClearMsg()));
|
||||
|
||||
action3 = new KURLLabel(top_action_frame);
|
||||
- action3->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
|
||||
+ //action3->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
|
||||
action3->setAlignment ( Qt::AlignHCenter );
|
||||
connect (action3, SIGNAL(leftClickedURL()), this, SLOT(slotaction3()));
|
||||
connect (action3, SIGNAL(enteredURL(const QString&)), this, SLOT(slotMessage3(const QString&)));
|
||||
connect (action3, SIGNAL(leftURL()), this, SLOT(slotClearMsg()));
|
||||
|
||||
action4 = new KURLLabel(top_action_frame);
|
||||
- action4->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
|
||||
+ //action4->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
|
||||
action4->setAlignment ( Qt::AlignHCenter );
|
||||
connect (action4, SIGNAL(leftClickedURL()), this, SLOT(slotaction4()));
|
||||
connect (action4, SIGNAL(enteredURL(const QString&)), this, SLOT(slotMessage4(const QString&)));
|
||||
@@ -633,7 +633,7 @@
|
||||
show_more = new KURLLabel(open_frame->mainWidget());
|
||||
show_more->setURL("more");
|
||||
show_more->setPixmap(SmallIcon("1downarrow"));
|
||||
- show_more->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
|
||||
+ //show_more->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
|
||||
show_more->setAlignment(Qt::AlignRight);
|
||||
show_more->show();
|
||||
|
||||
@@ -1801,7 +1801,7 @@
|
||||
show_more_actions = new KURLLabel(action_frame->mainWidget());
|
||||
show_more_actions->setURL("more");
|
||||
show_more_actions->setPixmap(SmallIcon("1downarrow"));
|
||||
- show_more_actions->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
|
||||
+ //show_more_actions->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
|
||||
show_more_actions->setAlignment(Qt::AlignRight);
|
||||
|
||||
connect(show_more_actions, SIGNAL(leftClickedURL()), this, SLOT(slotShowMoreActions()));
|
||||
diff -Naur kmetabar.orig/src/metaframe.cpp kmetabar/src/metaframe.cpp
|
||||
--- kmetabar.orig/src/metaframe.cpp 2006-11-06 18:48:04.000000000 +0200
|
||||
+++ kmetabar/src/metaframe.cpp 2006-11-06 18:56:07.000000000 +0200
|
||||
@@ -53,7 +53,7 @@
|
||||
isToggled = false;
|
||||
|
||||
titleButton = new HeaderLabel(this, isToggled);
|
||||
- titleButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
|
||||
+ //titleButton->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
|
||||
titleButton->setAlignment( Qt::AlignHCenter );
|
||||
connect (titleButton, SIGNAL(leftClickedURL()), this, SLOT(slotaction()));
|
||||
|
||||
@@ -216,7 +216,7 @@
|
||||
HeaderLabel::HeaderLabel(QWidget *parent, bool toggled) : KURLLabel(parent)
|
||||
{
|
||||
isToggled = toggled;
|
||||
- this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
|
||||
+ //this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
|
||||
this->setAlignment( Qt::AlignHCenter );
|
||||
this->setGlow(false);
|
||||
this->setFloat(true);
|
||||
@ -1,52 +0,0 @@
|
||||
--- src/kmetabar.h.orig 2005-09-06 12:12:39.000000000 +0200
|
||||
+++ src/kmetabar.h 2005-09-06 12:12:59.000000000 +0200
|
||||
@@ -8,10 +8,15 @@
|
||||
#include <konqsidebarplugin.h>
|
||||
#include <qstring.h>
|
||||
#include <qscrollview.h>
|
||||
+#include <kdemacros.h>
|
||||
|
||||
#include "kmetabar_widget.h"
|
||||
#include "metascrollview.h"
|
||||
|
||||
+#ifndef KDE_EXPORT
|
||||
+#define KDE_EXPORT
|
||||
+#endif
|
||||
+
|
||||
class Metabar : public KonqSidebarPlugin
|
||||
{
|
||||
Q_OBJECT
|
||||
--- src/kmetabar.cpp.orig 2005-09-06 12:00:33.000000000 +0200
|
||||
+++ src/kmetabar.cpp 2005-09-06 12:16:13.000000000 +0200
|
||||
@@ -2,9 +2,13 @@
|
||||
#include <kinstance.h>
|
||||
#include <qwidget.h>
|
||||
#include <kdebug.h>
|
||||
+#include <kdemacros.h>
|
||||
#include "kmetabar.h"
|
||||
#include "kmetabar.moc"
|
||||
|
||||
+#ifndef KDE_EXPORT
|
||||
+#define KDE_EXPORT
|
||||
+#endif
|
||||
|
||||
Metabar::Metabar(KInstance *inst,QObject *parent,QWidget *widgetParent, QString &desktopName, const char* name):
|
||||
KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name)
|
||||
@@ -40,7 +44,7 @@
|
||||
|
||||
|
||||
extern "C" {
|
||||
- KDE_EXPORT bool add_konqsidebar_kmetabar(QString* fn, QString* param, QMap<QString,QString> *map) {
|
||||
+ bool add_konqsidebar_kmetabar(QString* fn, QString* param, QMap<QString,QString> *map) {
|
||||
Q_UNUSED(param);
|
||||
|
||||
map->insert("Type", "Link");
|
||||
@@ -55,7 +59,7 @@
|
||||
|
||||
extern "C"
|
||||
{
|
||||
- KDE_EXPORT void* create_konqsidebar_kmetabar(KInstance *instance,QObject *par,QWidget *widp,QString &desktopname,const char *name)
|
||||
+ void* create_konqsidebar_kmetabar(KInstance *instance,QObject *par,QWidget *widp,QString &desktopname,const char *name)
|
||||
{
|
||||
return new Metabar(instance,par,widp,desktopname,name);
|
||||
}
|
||||
@ -1,68 +0,0 @@
|
||||
%define realversion 0.2-beta2
|
||||
|
||||
|
||||
|
||||
Summary: Konqueror Sidebar Plugin that shows Metadata and Information
|
||||
Name: kmetabar
|
||||
Version: 0.2beta2
|
||||
Release: %mkrel 3
|
||||
Source: http://kde-apps.org/content/files/28725-kmetabar-%{realversion}.tar.bz2
|
||||
URL: http://kde-apps.org/content/show.php?content=28725
|
||||
Patch0: kmetabar-fix.patch
|
||||
Patch1: kmetabar-kdemacros.diff
|
||||
Group: Graphical desktop/KDE3
|
||||
License: GPLv2+
|
||||
BuildRoot: %{_tmppath}/build-%{_name}-%{_version}
|
||||
Requires: kdelibs3
|
||||
Requires: arts, expat, fam, jack, kdebase3, libogg, libvorbis, glib2
|
||||
Requires: libart_lgpl, libpng, libstdc++, libgcc, resmgr, zlib
|
||||
BuildRequires: kdelibs3-devel,arts-devel, expat-devel, fam-devel
|
||||
BuildRequires: kdebase3-devel,libogg-devel
|
||||
BuildRequires: libvorbis-devel, glib2-devel
|
||||
BuildRequires: libart_lgpl-devel,libpng-devel
|
||||
|
||||
%description
|
||||
A sidebar plugin for KDE's Konqueror which shows information and actions for
|
||||
selected files and directories.
|
||||
|
||||
This is a fork of the "metabar" project: http://sourceforge.net/projects/metabar
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-0.2-beta2
|
||||
%patch0 -p0
|
||||
cd %{name}
|
||||
%patch1 -p0
|
||||
|
||||
%configure_kde3
|
||||
|
||||
%build
|
||||
cd %{name}
|
||||
%{make}
|
||||
|
||||
%install
|
||||
%{__rm} -rf %{buildroot}
|
||||
cd %{name}
|
||||
%makeinstall_std
|
||||
|
||||
%clean
|
||||
%{__rm} -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%_kde3_libdir/kde3/konqsidebar_kmetabar.so
|
||||
%_kde3_libdir/kde3/konqsidebar_kmetabar.la
|
||||
%_kde3_appsdir/kmetabar
|
||||
%_kde3_appsdir/konqsidebartng/add/kmetabar_add.desktop
|
||||
%_kde3_appsdir/konqsidebartng/entries/kmetabar.desktop
|
||||
%_kde3_iconsdir/*/*x*/apps/kmetabar.png
|
||||
%_kde3_docdir/*
|
||||
|
||||
%changelog
|
||||
* Mon Jul 18 2011 <tim@my-place.org.uk> 0.2.beta2-3mvt2010.2
|
||||
- Packaged for Trinity
|
||||
|
||||
* Fri Jul 23 2010 <tim@my-place.org.uk> 0.2.beta2-2mvt2010.1
|
||||
- Packaged for 2010.1
|
||||
|
||||
* Tue Dec 22 2009 <atilla_ontas@mandriva.org> 0.2.beta2-1mvt2010.0
|
||||
- Packaged for 2010.0
|
||||
@ -1,10 +0,0 @@
|
||||
--- kmymoney2-0.8.2/configure.in.in-- 2006-01-02 01:27:19.000000000 +0100
|
||||
+++ kmymoney2-0.8.2/configure.in.in 2006-01-02 01:27:25.000000000 +0100
|
||||
@@ -2,7 +2,6 @@
|
||||
|
||||
AM_INIT_AUTOMAKE(kmymoney2,0.8.2)
|
||||
|
||||
-KDE_ENABLE_HIDDEN_VISIBILITY
|
||||
|
||||
dnl
|
||||
dnl check for a recent autoconf version
|
||||
@ -1,21 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Name=KMyMoney
|
||||
GenericName=Personal Finance Manager
|
||||
GenericName[de]=Persönlicher Finanzassistent
|
||||
GenericName[fr]=Gestionnaire de finances personnelles
|
||||
GenericName[pt_BR]=Gerenciador Pessoal de Finanças
|
||||
GenericName[ru]=Учёт финансов
|
||||
GenericName[zh_CN]=个人财务管理软件
|
||||
Exec=kmymoney2
|
||||
Comment=Personal Finance Manager
|
||||
Comment[de]=Persönlicher Finanzassistent
|
||||
Comment[fr]=Gestionnaire de finances personnelles
|
||||
comment[pt_BR]=Gerenciador Pessoal de Finanças
|
||||
Comment[ru]=Учёт финансов
|
||||
Comment[zh_CN]=个人财务管理软件
|
||||
MimeType=application/x-kmymoney;application/vnd.intu.qfx;application/x-ofx;
|
||||
Type=Application
|
||||
DocPath=kmymoney2/index.html
|
||||
Icon=kmymoney2
|
||||
ServiceTypes=
|
||||
Categories=Office;Finance;Qt;KDE;
|
||||
@ -1,278 +0,0 @@
|
||||
%define lib_name_orig %mklibname %name
|
||||
%define lib_major 0
|
||||
%define lib_name %mklibname %name %lib_major
|
||||
%define develname %mklibname -d %name
|
||||
|
||||
Name: kmymoney2
|
||||
Version: 1.0.2
|
||||
Release: %mkrel 3
|
||||
Summary: Kmymoney2 The Personal Finances Manager for kde3
|
||||
Source0: http://kent.dl.sourceforge.net/sourceforge/kmymoney2/%{name}-%{version}.tar.bz2
|
||||
Source1: kmymoney2.desktop
|
||||
Url: http://kmymoney2.sourceforge.net/
|
||||
License: GPLv2+
|
||||
Group: Graphical desktop/KDE
|
||||
BuildRoot: %_tmppath/%name-%version-%release-root
|
||||
BuildRequires: kdelibs-devel
|
||||
BuildRequires: jpeg-devel mng-devel png-devel qt3-devel
|
||||
BuildRequires: aqhbci-devel > 0.3.0
|
||||
BuildRequires: OpenSP-devel libofx-devel
|
||||
Requires: %lib_name = %version-%release
|
||||
Patch0: kmymoney-0.8.2-disable-visibility.patch
|
||||
|
||||
%description
|
||||
The Personal Finances Manager for KDE 3.
|
||||
|
||||
%files -f %name.lang
|
||||
%defattr(-,root,root)
|
||||
%_kde3_bindir/*
|
||||
%_kde3_datadir/apps/%name
|
||||
%_kde3_iconsdir/*/*/*/*
|
||||
%_kde3_datadir/applications/kde/*.desktop
|
||||
%_kde3_datadir/services/*.desktop
|
||||
%_kde3_datadir/servicetypes/*.desktop
|
||||
%_kde3_datadir/apps/kmm_ofximport
|
||||
%_kde3_datadir/config.kcfg/kmymoney2.kcfg
|
||||
%_mandir/man1/*
|
||||
%_kde3_datadir/mimelnk/application/*.desktop
|
||||
%_kde3_datadir/icons/Tango/scalable/*
|
||||
%_kde3_datadir/icons/oxygen/scalable/*
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package -n %lib_name
|
||||
Group: Development/KDE and Qt
|
||||
Summary: Libraries for %name
|
||||
|
||||
%description -n %lib_name
|
||||
Librairie for %name
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n %lib_name -p /sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %lib_name -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files -n %lib_name
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_libdir/kde3/kmm_ofximport.la
|
||||
%_kde3_libdir/kde3/kmm_ofximport.so
|
||||
%_kde3_libdir/libkmm_mymoney.la
|
||||
%_kde3_libdir/libkmm_mymoney.so.*
|
||||
%_kde3_libdir/libkmm_plugin.la
|
||||
%_kde3_libdir/libkmm_plugin.so.*
|
||||
%_kde3_libdir/libkmm_kdchart.so.*
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package -n %develname
|
||||
Group: Development/KDE and Qt
|
||||
Summary: Devel files for %name
|
||||
Requires: %lib_name = %{version}-%{release}
|
||||
Obsoletes: %lib_name-devel
|
||||
|
||||
%description -n %develname
|
||||
Devel file for %name
|
||||
|
||||
%files -n %develname
|
||||
%defattr(-,root,root,-)
|
||||
%dir %_kde3_includedir/kmymoney/
|
||||
%_kde3_includedir/kmymoney/*.h
|
||||
%_kde3_libdir/libkmm_mymoney.so
|
||||
%_kde3_libdir/libkmm_plugin.so
|
||||
%_kde3_libdir/libkmm_kdchart.la
|
||||
%_kde3_libdir/libkmm_kdchart.so
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
|
||||
%setup -q
|
||||
#%patch0 -p1 -b .disable_visibility
|
||||
|
||||
%build
|
||||
%define _disable_ld_no_undefined 1
|
||||
%configure_kde3 \
|
||||
--enable-ofxplugin \
|
||||
--enable-ofxbanking --disable-final --disable-sqlite3
|
||||
#necessary to remove old files
|
||||
make clean
|
||||
|
||||
%make
|
||||
|
||||
%install
|
||||
%makeinstall_std
|
||||
|
||||
# Translation team modified desktop file
|
||||
cp -f %SOURCE1 %buildroot/%_kde3_datadir/applications/kde/
|
||||
|
||||
%find_lang %name --with-html
|
||||
|
||||
%clean
|
||||
rm -fr %buildroot
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Jul 26 2011 Tim Williams <tim@my-place.org.uk> 1.0.2-3mdv2010.2
|
||||
+ rebuild for Trinity
|
||||
|
||||
* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 1.0.2-2mdv2010.1
|
||||
+ rebuild for MDV 2010.1
|
||||
|
||||
* Thu Nov 19 2009 Tim Williams <tim@my-place.org.uk> 1.0.2-1mdv2010.0
|
||||
+ Update source to 1.0.2
|
||||
+ rebuild for MDV 2010.0
|
||||
|
||||
* Wed Mar 04 2009 Nicolas Lécureuil <neoclust@mandriva.org> 0.9.3-1mdv2009.1
|
||||
+ Revision: 348190
|
||||
- Update to 0.9.3
|
||||
Disable sqlite3 support for now, the build must be fixed before
|
||||
|
||||
* Sat Nov 08 2008 Oden Eriksson <oeriksson@mandriva.com> 0.8.9-5mdv2009.1
|
||||
+ Revision: 301009
|
||||
- rebuilt against new libxcb
|
||||
|
||||
+ Helio Chissini de Castro <helio@mandriva.com>
|
||||
- Updated desktop file as requested by translation team
|
||||
|
||||
* Sat Jul 26 2008 Nicolas Lécureuil <neoclust@mandriva.org> 0.8.9-3mdv2009.0
|
||||
+ Revision: 250088
|
||||
- Disable enable final
|
||||
- Fix typo
|
||||
- Fix specfile layout
|
||||
- Rebuild because BS failure
|
||||
- Move to /opt
|
||||
Move Kmoney2 out of "More"
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
|
||||
- do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
|
||||
|
||||
* Thu Apr 17 2008 Funda Wang <fundawang@mandriva.org> 0.8.9-1mdv2009.0
|
||||
+ Revision: 195065
|
||||
- disable kbanking as it does not exist any more
|
||||
- Bump requires on aqbanking
|
||||
- New version 0.8.9
|
||||
|
||||
* Sat Mar 08 2008 Funda Wang <fundawang@mandriva.org> 0.8.8-2mdv2008.1
|
||||
+ Revision: 182081
|
||||
- cleanup spec file
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
* Fri Dec 21 2007 Funda Wang <fundawang@mandriva.org> 0.8.8-1mdv2008.1
|
||||
+ Revision: 136311
|
||||
- New version 0.8.8
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
- replace %%_datadir/man by %%_mandir!
|
||||
|
||||
* Mon Jul 23 2007 Funda Wang <fundawang@mandriva.org> 0.8.7-1mdv2008.0
|
||||
+ Revision: 54782
|
||||
- New version
|
||||
|
||||
* Fri Jul 13 2007 Funda Wang <fundawang@mandriva.org> 0.8.6-2mdv2008.0
|
||||
+ Revision: 51845
|
||||
- New develpackage policy
|
||||
|
||||
|
||||
* Sat Mar 10 2007 Laurent Montel <lmontel@mandriva.com> 0.8.6-1mdv2007.1
|
||||
+ Revision: 140315
|
||||
- 0.8.6
|
||||
- Rebuild
|
||||
- Import kmymoney2
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- Fix BuildRequires
|
||||
|
||||
* Fri Sep 01 2006 Laurent MONTEL <lmontel@mandriva.com> 0.8.5-1
|
||||
- 0.8.5
|
||||
|
||||
* Mon Jun 19 2006 Laurent MONTEL <lmontel@mandriva.com> 0.8.4-2mdk
|
||||
- Fix missing build requires
|
||||
|
||||
* Sun May 21 2006 Laurent MONTEL <lmontel@mandriva.com> 0.8.4-1mdk
|
||||
- 0.8.4
|
||||
|
||||
* Thu Apr 20 2006 Laurent MONTEL <lmontel@mandriva.com> 0.8.3-4mdk
|
||||
- Fix requires
|
||||
|
||||
* Thu Apr 20 2006 Laurent MONTEL <lmontel@mandriva.com> 0.8.3-3mdk
|
||||
- Rebuild
|
||||
|
||||
* Mon Feb 27 2006 Laurent MONTEL <lmontel@mandriva.com> 0.8.3-2mdk
|
||||
- Fix build kbanking plugins
|
||||
|
||||
* Mon Feb 27 2006 Laurent MONTEL <lmontel@mandriva.com> 0.8.3-1mdk
|
||||
- 0.8.3
|
||||
|
||||
* Tue Jan 03 2006 Laurent MONTEL <lmontel@mandriva.com> 0.8.2-2mdk
|
||||
- Fix compile under x86_64
|
||||
|
||||
* Mon Jan 02 2006 Laurent MONTEL <lmontel@mandriva.com> 0.8.2-1mdk
|
||||
- 0.8.2
|
||||
|
||||
* Sun Nov 06 2005 Laurent MONTEL <lmontel@mandriva.com> 0.8.1-1mdk
|
||||
- 0.8.1
|
||||
|
||||
* Sun Aug 14 2005 Laurent MONTEL <lmontel@mandriva.com> 0.8.0-1mdk
|
||||
- 0.8.0
|
||||
|
||||
* Sun Jul 31 2005 Laurent MONTEL <lmontel@mandriva.com> 0.7.5-1mdk
|
||||
- 0.7.5
|
||||
|
||||
* Tue Jul 19 2005 Laurent MONTEL <lmontel@mandriva.com> 0.7.4-1mdk
|
||||
- 0.7.4
|
||||
|
||||
* Sat Jul 09 2005 Laurent MONTEL <lmontel@mandriva.com> 0.7.3-1mdk
|
||||
- 0.7.3
|
||||
|
||||
* Wed Jun 01 2005 Laurent MONTEL <lmontel@mandriva.com> 0.7.2-1mdk
|
||||
- 0.7.2
|
||||
|
||||
* Tue May 24 2005 Laurent MONTEL <lmontel@mandriva.com> 0.7.1-2mdk
|
||||
- Add --enable-ofxplugin
|
||||
|
||||
* Sun May 22 2005 Laurent MONTEL <lmontel@mandriva.com> 0.7.1-1mdk
|
||||
- 0.7.1
|
||||
|
||||
* Fri May 20 2005 Laurent MONTEL <lmontel@mandriva.com> 0.7.0-2mdk
|
||||
- Enable --enable-kbanking
|
||||
|
||||
* Sun May 15 2005 Laurent MONTEL <lmontel@mandriva.com> 0.7.0-1mdk
|
||||
- 0.7.0
|
||||
|
||||
* Sat May 07 2005 Laurent MONTEL <lmontel@mandriva.com> 0.6.4-3mdk
|
||||
- fix build on x86_64
|
||||
|
||||
* Thu Dec 09 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.4-2mdk
|
||||
- Fix menu
|
||||
|
||||
* Thu Nov 04 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.4-1mdk
|
||||
- 06.4
|
||||
|
||||
* Mon Nov 01 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.3-1mdk
|
||||
- 0.6.3
|
||||
|
||||
* Thu Sep 30 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.2-2mdk
|
||||
- kde2 -> kde3 thanks (Eskild Hustvedt <eskild@mandrakehelp.com>)
|
||||
- clean spec file
|
||||
|
||||
* Sat Sep 25 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.2-1mdk
|
||||
- New version
|
||||
|
||||
* Sat Aug 14 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.1-2mdk
|
||||
- Rebuild with new menu translation table
|
||||
|
||||
* Wed Jul 21 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6.1-1mdk
|
||||
- 0.6.1
|
||||
|
||||
* Tue Jun 29 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6-1mdk
|
||||
- 0.6
|
||||
|
||||
* Tue Jun 15 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 0.5.1-4mdk
|
||||
- Rebuild
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
--- knoda/knoda.desktop.orig 2007-10-22 20:32:37.000000000 +0800
|
||||
+++ knoda/knoda.desktop 2007-10-22 20:32:50.000000000 +0800
|
||||
@@ -1,7 +1,7 @@
|
||||
[Desktop Entry]
|
||||
Name=knoda
|
||||
Exec=knoda
|
||||
-Icon=knoda.png
|
||||
+Icon=knoda
|
||||
Type=Application
|
||||
MimeType=application/x-sqlite3;application/x-sqlite2;application/x-hk_classes-sqlite3;application/x-hk_classes-sqlite2;application/x-msaccess;application/x-dbase;application/x-hk_connection;application/x-paradox;
|
||||
DocPath=knoda/index.html
|
||||
@@ -12,5 +12,4 @@
|
||||
Comment[fr]=Application base de données
|
||||
Comment[it]=Un'applicazione base di dati
|
||||
Terminal=false
|
||||
-Encoding=UTF-8
|
||||
-Categories=Qt;KDE;Office;Database;
|
||||
\ No newline at end of file
|
||||
+Categories=Qt;KDE;Office;Database;
|
||||
@ -1,9 +0,0 @@
|
||||
--- knoda/x-hk_classes-sqlite3.desktop.orig 2007-09-01 10:11:04.000000000 +0800
|
||||
+++ knoda/x-hk_classes-sqlite3.desktop 2007-09-01 10:11:12.000000000 +0800
|
||||
@@ -6,6 +6,5 @@
|
||||
Patterns=*.hk_sqlite3
|
||||
Comment=Sqlite3 database (knoda)
|
||||
Comment[de]=Sqlite3 Datenbank (knoda)
|
||||
-Comment[fr]=Sqlite3 base de données (knoda)
|
||||
Comment[es]=Sqlite3 base de datos (knoda)
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB |
@ -1,115 +0,0 @@
|
||||
%define oname KOSD
|
||||
|
||||
Name: kosd-kde3
|
||||
Version: 0.2.3
|
||||
Release: %mkrel 5
|
||||
Summary: An application showing OSD to respond volume buttons
|
||||
License: GPLv2+
|
||||
Group: Graphical desktop/KDE3
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
URL: http://www.kde-apps.org/content/show.php?content=81457
|
||||
Source: http://www.kde-apps.org/CONTENT/content-files/81457-%{oname}-%{version}.tar.bz2
|
||||
Patch0: kde-3.5.10-acinclude.patch
|
||||
Patch1: fix_autotools.patch
|
||||
BuildRequires: kde3-macros
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
BuildRequires: automake >= 1.6.1
|
||||
%else
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
BuildRequires: automake >= 1.11
|
||||
%endif
|
||||
BuildRequires: kdelibs-devel
|
||||
Requires: kde3-kmix
|
||||
Obsoletes: kde3-kvolumeosd < %version
|
||||
|
||||
%description
|
||||
KOSD is a simple KDE application that runs in the background and
|
||||
responds to volume buttons by showing a little OSD. It delegates the
|
||||
actual job of adjusting the volume to KMix.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{oname}
|
||||
%if %mdkversion >= 201000
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
make -f Makefile.cvs
|
||||
%configure_kde3
|
||||
%make
|
||||
|
||||
%install
|
||||
rm -rf %buildroot
|
||||
%makeinstall_std
|
||||
|
||||
%find_lang kosd --with-html
|
||||
|
||||
mkdir -p %buildroot%_kde3_datadir/applications/kde
|
||||
mv %buildroot/share/applications/*.desktop %buildroot%_kde3_datadir/applications/kde
|
||||
|
||||
%clean
|
||||
rm -rf %buildroot
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post
|
||||
%{update_menus}
|
||||
%update_kde3_icon_cache hicolor
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun
|
||||
%{clean_menus}
|
||||
%clean_kde3_icon_cache hicolor
|
||||
%endif
|
||||
|
||||
%files -f kosd.lang
|
||||
%defattr(-,root,root)
|
||||
%{_kde3_bindir}/kosd
|
||||
%{_kde3_appsdir}/kosd
|
||||
%{_kde3_datadir}/applications/kde/*.desktop
|
||||
%{_kde3_iconsdir}/hicolor/*/apps/*
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 22 2011 Tim Williams <tim@my-place.org.uk> 0.2.3-5mdv2010.2
|
||||
+ Rebuild for Trinity
|
||||
|
||||
* Fri Jul 23 2010 Tim Williams <tim@my-place.org.uk> 0.2.3-4mdv2010.1
|
||||
+ Rebuild for MDV 2010.1
|
||||
|
||||
* Sat Feb 13 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.2.3-3mdv2010.0
|
||||
+ Fix built issues with autocnf 2.65 and automake 1.11
|
||||
+ Change package group
|
||||
|
||||
* Mon Nov 16 2009 Tim Williams <tim@my-place.org.uk> 0.2.3-2mdv2010.0
|
||||
+ Rebuild for MDV 2010.0
|
||||
|
||||
* Fri Aug 01 2008 Funda Wang <fundawang@mandriva.org> 0.2.3-1mdv2009.0
|
||||
+ Revision: 259119
|
||||
- New version 0.2.3
|
||||
|
||||
* Wed Jul 30 2008 Funda Wang <fundawang@mandriva.org> 0.2.2-1mdv2009.0
|
||||
+ Revision: 254587
|
||||
- New version 0.2.2
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
|
||||
|
||||
* Wed Jun 04 2008 Funda Wang <fundawang@mandriva.org> 0.2.1-1mdv2009.0
|
||||
+ Revision: 214973
|
||||
- Rename to kosd
|
||||
- new version 0.2.1
|
||||
- rename to kosd
|
||||
|
||||
* Fri May 09 2008 Funda Wang <fundawang@mandriva.org> 0.1-2mdv2009.0
|
||||
+ Revision: 205328
|
||||
- fix post and postun script
|
||||
|
||||
* Fri May 09 2008 Funda Wang <fundawang@mandriva.org> 0.1-1mdv2009.0
|
||||
+ Revision: 205299
|
||||
- fix name
|
||||
- import source and spec
|
||||
- Created package structure for kde3-kvolumeosd.
|
||||
|
||||
@ -1,167 +0,0 @@
|
||||
%define oname krandr
|
||||
Name: kde3-%{oname}
|
||||
Summary: Applet for configuring screen size and rotation
|
||||
Version: 0.5.2.1
|
||||
Release: %mkrel 19
|
||||
License: GPL
|
||||
Group: Graphical desktop/KDE3
|
||||
URL: http://git.mandriva.com/?p=projects/%{oname}.git
|
||||
Source0: %{oname}-%{version}.tar.gz
|
||||
Patch0: %{oname}-0.5.2.1-legacy_randr_on_single_output.patch
|
||||
Patch1: %{oname}-0.5.2-display_switch.patch
|
||||
Patch2: %{oname}-0.5.2.1-fix_rrate_display.patch
|
||||
Patch3: %{oname}-0.5.2.1-fix_autostart.patch
|
||||
Patch4: %{oname}-0.5.2.1-add-mandriva-translations.patch
|
||||
Patch5: %{oname}-0.5.2.1-change_the_way_crtcs_are_set.patch
|
||||
Patch6: %{oname}-0.5.2.1-grab_server_avoiding_crashes.patch
|
||||
Patch7: %{oname}-0.5.2.1-flush_after_ungrab.patch
|
||||
Patch8: kde-3.5.10-acinclude.patch
|
||||
Patch9: fix_autotools.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
BuildRequires: kde3-macros
|
||||
BuildRequires: automake >= 1.6.1
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
%else
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
%endif
|
||||
BuildRequires: qt3-devel >= 3.3.3
|
||||
BuildRequires: kdelibs-devel
|
||||
BuildRequires: kde3-macros
|
||||
Conflicts: kdebase-common <= 1:3.5.7-18mdv2008.0
|
||||
Conflicts: libkdebase4 <= 1:3.5.7-20mdv2008.0
|
||||
Provides: %{oname} = %version-%release
|
||||
Obsoletes: %{oname}
|
||||
|
||||
%description
|
||||
KRandr is an applet for configuring screen size and rotation through the XRandR
|
||||
extension.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{oname}-%{version}
|
||||
%patch0 -p1 -b .legacyrandr
|
||||
%patch1 -p1 -b .displayswitch
|
||||
%patch2 -p1 -b .rrate_display
|
||||
%patch3 -p1 -b .fix_autostart
|
||||
%patch4 -p1 -b .test_translations
|
||||
%patch5 -p1 -b .crtc_set
|
||||
%patch6 -p1 -b .grab_server
|
||||
%patch7 -p1 -b .flush_after_ungrab
|
||||
%if %mdkversion >= 201000
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
%define _disable_ld_no_undefined 1
|
||||
make -f admin/Makefile.common cvs
|
||||
%configure_kde3
|
||||
%make
|
||||
|
||||
%install
|
||||
rm -rf %buildroot
|
||||
%makeinstall_std
|
||||
|
||||
# install %{oname}tray in kde autostart
|
||||
install -d -m 0755 %{buildroot}%{_kde3_datadir}/autostart
|
||||
cp -f %{buildroot}%{_kde3_datadir}/applications/kde/%{oname}tray.desktop %{buildroot}%{_kde3_datadir}/autostart/
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%{_kde3_bindir}/%{oname}tray
|
||||
%{_kde3_libdir}/kde3/kcm_randr.*
|
||||
%{_kde3_datadir}/applications/kde/%{oname}tray.desktop
|
||||
%{_kde3_datadir}/applnk/.hidden/randr.desktop
|
||||
%{_kde3_datadir}/autostart/%{oname}tray.desktop
|
||||
# remove the non wanted files
|
||||
%exclude %{_kde3_datadir}/doc/HTML/en/%{oname}
|
||||
%exclude %{_kde3_datadir}/locale/*/LC_MESSAGES/%{oname}.mo
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jul 19 2010 Tim Williams <tim@my-place.org.uk> 0.5.2.1-19mdv2010.1
|
||||
+ Rebuild for MDV 2010.2/Trinity
|
||||
|
||||
* Mon Jul 19 2010 Tim Williams <tim@my-place.org.uk> 0.5.2.1-18mdv2010.1
|
||||
+ Rebuild for MDV 2010.1
|
||||
|
||||
* Fri Feb 12 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.5.2.1-17mdv2010.0
|
||||
+ KDE builds with autoconf 2.65, add patch for this and
|
||||
set autoconf to version 2.65
|
||||
- Rename package name and group to avoid possible future kde4 conflicts
|
||||
|
||||
* Fri Nov 13 2009 Tim Williams <tim@my-place.org.uk> 0.5.2.1-16mdv2010.0
|
||||
+ Rebuild for MDV 2010.0
|
||||
|
||||
* Tue Jul 22 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.5.2.1-15mdv2009.0
|
||||
+ Revision: 240518
|
||||
- Flush the X calls after calling XUngrabServer to avoid deadlocks
|
||||
|
||||
* Sat Jun 14 2008 Anssi Hannula <anssi@mandriva.org> 0.5.2.1-14mdv2009.0
|
||||
+ Revision: 219126
|
||||
- rebuild to get higher evr than 2008.1 updates (needed for kde4 conflicts)
|
||||
|
||||
* Mon May 05 2008 Helio Chissini de Castro <helio@mandriva.com> 0.5.2.1-13mdv2009.0
|
||||
+ Revision: 201520
|
||||
- Update %{oname} to new build of moved kde3
|
||||
|
||||
* Mon Mar 31 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.5.2.1-12mdv2008.1
|
||||
+ Revision: 191318
|
||||
- Grab the X server in order for the changes to be atomic
|
||||
|
||||
* Fri Mar 28 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.5.2.1-11mdv2008.1
|
||||
+ Revision: 190977
|
||||
- Fix the way the screen are upper-sized when the resolution of the CRTC is
|
||||
changed. This avoids kicker and kwin getting lost on parsing X events.
|
||||
|
||||
* Mon Mar 10 2008 Thierry Vignaud <tvignaud@mandriva.com> 0.5.2.1-10mdv2008.1
|
||||
+ Revision: 183618
|
||||
- fix description
|
||||
|
||||
* Mon Mar 10 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.5.2.1-9mdv2008.1
|
||||
+ Revision: 183512
|
||||
- Use the correct autostart condition so that it is actually started (#38455)
|
||||
|
||||
* Fri Feb 22 2008 Nicolas Lécureuil <neoclust@mandriva.org> 0.5.2.1-8mdv2008.1
|
||||
+ Revision: 174021
|
||||
- Add translations for mandriva strings
|
||||
|
||||
* Thu Jan 03 2008 Oden Eriksson <oeriksson@mandriva.com> 0.5.2.1-7mdv2008.1
|
||||
+ Revision: 141739
|
||||
- rebuilt against openldap-2.4.7 libs
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
|
||||
* Wed Oct 03 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.5.2.1-6mdv2008.0
|
||||
+ Revision: 94865
|
||||
- Make it possible to disable %{oname} autostart (#34378)
|
||||
|
||||
* Fri Sep 28 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.5.2.1-5mdv2008.0
|
||||
+ Revision: 93579
|
||||
- Make %{oname} start at session startup (#34047)
|
||||
- Remove the dummy documentation files
|
||||
|
||||
* Mon Sep 17 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.5.2.1-4mdv2008.0
|
||||
+ Revision: 89338
|
||||
- Fix displaying of refresh rates (#33710)
|
||||
|
||||
* Thu Sep 13 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.5.2.1-3mdv2008.0
|
||||
+ Revision: 85303
|
||||
- add a display switch shortcut
|
||||
- add proper conflicts to libkdebase4 (#32957)
|
||||
|
||||
* Wed Sep 12 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.5.2.1-2mdv2008.0
|
||||
+ Revision: 84651
|
||||
- Use the legacy randr interface when there is only one output available
|
||||
(mostly drivers that do not support RandR1.2 yet)
|
||||
|
||||
* Tue Aug 28 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.5.2.1-1mdv2008.0
|
||||
+ Revision: 72849
|
||||
- Fix group and point the URL to the git repository of %{oname}
|
||||
- Import %{oname}
|
||||
|
||||
@ -1,187 +0,0 @@
|
||||
--- krandr-0.5.2.1/randr/krandrtray.h.orig 2007-09-03 18:05:43.000000000 -0300
|
||||
+++ krandr-0.5.2.1/randr/krandrtray.h 2007-09-03 18:29:15.000000000 -0300
|
||||
@@ -37,6 +37,9 @@ public:
|
||||
|
||||
void configChanged();
|
||||
|
||||
+public slots:
|
||||
+ void slotSwitchDisplay();
|
||||
+
|
||||
protected slots:
|
||||
void slotScreenActivated();
|
||||
void slotResolutionChanged(int parameter);
|
||||
--- krandr-0.5.2.1/randr/randrdisplay.h.orig 2007-09-03 18:05:43.000000000 -0300
|
||||
+++ krandr-0.5.2.1/randr/randrdisplay.h 2007-09-03 18:31:43.000000000 -0300
|
||||
@@ -51,6 +51,8 @@ public:
|
||||
|
||||
void refresh();
|
||||
|
||||
+ void switchOutput();
|
||||
+
|
||||
/**
|
||||
* Loads saved settings.
|
||||
*
|
||||
--- krandr-0.5.2.1/randr/randrscreen.h.orig 2007-09-03 18:05:43.000000000 -0300
|
||||
+++ krandr-0.5.2.1/randr/randrscreen.h 2007-09-03 18:32:51.000000000 -0300
|
||||
@@ -40,6 +40,8 @@ public:
|
||||
|
||||
int index() const;
|
||||
|
||||
+ void switchOutput();
|
||||
+
|
||||
XRRScreenResources* resources() const;
|
||||
Window rootWindow() const;
|
||||
|
||||
--- krandr-0.5.2.1/randr/krandrtray.cpp.orig 2007-09-03 18:05:43.000000000 -0300
|
||||
+++ krandr-0.5.2.1/randr/krandrtray.cpp 2007-09-04 10:12:05.000000000 -0300
|
||||
@@ -17,6 +17,7 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||
*/
|
||||
|
||||
+#include <kglobalaccel.h>
|
||||
#include <kapplication.h>
|
||||
#include <kpopupmenu.h>
|
||||
#include <khelpmenu.h>
|
||||
@@ -33,6 +34,7 @@
|
||||
#include "randroutput.h"
|
||||
#include "randrmode.h"
|
||||
|
||||
+#include <kdebug.h>
|
||||
KRandRSystemTray::KRandRSystemTray(RandRDisplay *dpy, QWidget* parent, const char *name)
|
||||
: KSystemTray(parent, name)
|
||||
, m_popupUp(false), m_display(dpy)
|
||||
@@ -43,6 +45,16 @@ KRandRSystemTray::KRandRSystemTray(RandR
|
||||
connect(this, SIGNAL(quitSelected()), kapp, SLOT(quit()));
|
||||
QToolTip::add(this, i18n("Screen resize & rotate"));
|
||||
|
||||
+ KConfig cfg("kcmrandrrc");
|
||||
+ cfg.setGroup("General");
|
||||
+
|
||||
+ KGlobalAccel *accel = new KGlobalAccel(this);
|
||||
+ accel->insert( "DisplaySwitch", i18n("Switch displays"),
|
||||
+ i18n("Switch between active displays."),
|
||||
+ CTRL+SHIFT+Key_S, KKey::QtWIN+CTRL+Key_S, this, SLOT(slotSwitchDisplay()) );
|
||||
+
|
||||
+ accel->readSettings(&cfg);
|
||||
+ accel->updateConnections();
|
||||
}
|
||||
|
||||
void KRandRSystemTray::mousePressEvent(QMouseEvent* e)
|
||||
@@ -456,3 +468,8 @@ void KRandRSystemTray::slotPrefs()
|
||||
kcm->setPlainCaption( i18n( "Configure Display" ) );
|
||||
kcm->exec();
|
||||
}
|
||||
+
|
||||
+void KRandRSystemTray::slotSwitchDisplay()
|
||||
+{
|
||||
+ m_display->switchOutput();
|
||||
+}
|
||||
--- krandr-0.5.2.1/randr/randrdisplay.cpp.orig 2007-09-03 18:05:43.000000000 -0300
|
||||
+++ krandr-0.5.2.1/randr/randrdisplay.cpp 2007-09-03 18:32:35.000000000 -0300
|
||||
@@ -300,3 +300,10 @@ void RandRDisplay::applyProposed(bool co
|
||||
}
|
||||
}
|
||||
|
||||
+void RandRDisplay::switchOutput()
|
||||
+{
|
||||
+#ifdef HAS_RANDR_1_2
|
||||
+ if (RandR::has_1_2)
|
||||
+ currentScreen()->switchOutput();
|
||||
+#endif
|
||||
+}
|
||||
--- krandr-0.5.2.1/randr/randrscreen.cpp.orig 2007-09-03 18:05:43.000000000 -0300
|
||||
+++ krandr-0.5.2.1/randr/randrscreen.cpp 2007-09-04 12:45:23.000000000 -0300
|
||||
@@ -581,6 +581,93 @@ void RandRScreen::slotOutputChanged(RROu
|
||||
emit configChanged();
|
||||
}
|
||||
|
||||
+void RandRScreen::switchOutput()
|
||||
+{
|
||||
+ //refresh settings so that the new monitor gets detected
|
||||
+ loadSettings();
|
||||
+
|
||||
+ // if there is just one connected output, do not switch
|
||||
+ if (connectedCount() < 2)
|
||||
+ return;
|
||||
+
|
||||
+ // disable all outputs and activate the first connected one
|
||||
+ if (activeCount() > 1)
|
||||
+ {
|
||||
+ bool first = true;
|
||||
+ slotUnifyOutputs(0);
|
||||
+ OutputMap::iterator it;
|
||||
+ for(it = m_outputs.begin(); it != m_outputs.end(); ++it)
|
||||
+ {
|
||||
+ RandROutput *output = *it;
|
||||
+ if (first && output->isActive())
|
||||
+ first = false;
|
||||
+ else if (first && output->isConnected())
|
||||
+ {
|
||||
+ SizeList sizes = output->sizes();
|
||||
+ if (!sizes.count())
|
||||
+ continue;
|
||||
+
|
||||
+ output->proposeRect(QRect(QPoint(0,0), sizes.first()));
|
||||
+ if (output->applyProposed(false))
|
||||
+ first = false;
|
||||
+ else
|
||||
+ output->slotDisable();
|
||||
+ }
|
||||
+ else
|
||||
+ output->slotDisable();
|
||||
+ }
|
||||
+
|
||||
+ for(it = m_outputs.begin(); it != m_outputs.end(); ++it)
|
||||
+ {
|
||||
+ RandROutput *output = *it;
|
||||
+ if (output->isConnected())
|
||||
+ {
|
||||
+ SizeList sizes = output->sizes();
|
||||
+ if (!sizes.count())
|
||||
+ continue;
|
||||
+
|
||||
+ output->proposeRect(QRect(QPoint(0,0), sizes.first()));
|
||||
+ if (output->applyProposed(RandR::ChangeRect, false))
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ OutputMap::iterator it;
|
||||
+ // first disable the currently active output and try to active the next
|
||||
+ // connected one
|
||||
+ bool found_active = false, found_connected = false;
|
||||
+ for(it = m_outputs.begin(); it != m_outputs.end(); ++it)
|
||||
+ {
|
||||
+ RandROutput *output = *it;
|
||||
+ if (!found_active && output->isActive())
|
||||
+ {
|
||||
+ output->slotDisable();
|
||||
+ found_active = true;
|
||||
+ }
|
||||
+ else if (found_active && output->isConnected())
|
||||
+ {
|
||||
+ SizeList sizes = output->sizes();
|
||||
+ if (!sizes.count())
|
||||
+ continue;
|
||||
+
|
||||
+ output->proposeRect(QRect(QPoint(0,0), sizes.first()));
|
||||
+ if (output->applyProposed(RandR::ChangeRect, false))
|
||||
+ {
|
||||
+ found_connected = true;
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ // if we could not find the next connected output after the active one,
|
||||
+ // activate all
|
||||
+ if (!found_connected)
|
||||
+ slotUnifyOutputs(1);
|
||||
+ } // if activeCount < 2
|
||||
+}
|
||||
+
|
||||
#include "randrscreen.moc"
|
||||
|
||||
#endif
|
||||
@ -1,11 +0,0 @@
|
||||
--- krandr-0.5.2.1/randr/krandrtray.cpp~ 2008-02-22 22:45:54.000000000 +0100
|
||||
+++ krandr-0.5.2.1/randr/krandrtray.cpp 2008-02-22 22:59:44.000000000 +0100
|
||||
@@ -111,7 +111,7 @@
|
||||
}
|
||||
|
||||
menu->insertSeparator();
|
||||
-
|
||||
+ KGlobal::locale()->insertCatalogue("mandriva-kde-translation");
|
||||
lastIndex = menu->insertItem(i18n( "Start KRandR when KDE starts" ));
|
||||
menu->connectItem(lastIndex, this, SLOT(slotToggleRunStartup()));
|
||||
menu->setItemChecked( lastIndex, m_runStartup );
|
||||
@ -1,131 +0,0 @@
|
||||
diff -p -up krandr-0.5.2.1/randr/randrcrtc.cpp.orig krandr-0.5.2.1/randr/randrcrtc.cpp
|
||||
--- krandr-0.5.2.1/randr/randrcrtc.cpp.orig 2008-03-28 13:56:38.000000000 -0300
|
||||
+++ krandr-0.5.2.1/randr/randrcrtc.cpp 2008-03-28 16:15:57.000000000 -0300
|
||||
@@ -30,6 +30,13 @@ RandRCrtc::RandRCrtc(RandRScreen *parent
|
||||
Q_ASSERT(m_screen);
|
||||
|
||||
m_id = id;
|
||||
+
|
||||
+ // just to make sure it gets initialized
|
||||
+ m_proposedRect = m_currentRect;
|
||||
+ m_proposedRotation = m_currentRotation;
|
||||
+ m_proposedRate = m_currentRate;
|
||||
+
|
||||
+
|
||||
loadSettings();
|
||||
}
|
||||
|
||||
@@ -116,11 +123,6 @@ void RandRCrtc::loadSettings(bool notify
|
||||
changes |= RandR::ChangeRate;
|
||||
}
|
||||
|
||||
- // just to make sure it gets initialized
|
||||
- m_proposedRect = m_currentRect;
|
||||
- m_proposedRotation = m_currentRotation;
|
||||
- m_proposedRate = m_currentRate;
|
||||
-
|
||||
// free the info
|
||||
XRRFreeCrtcInfo(info);
|
||||
|
||||
@@ -130,6 +132,7 @@ void RandRCrtc::loadSettings(bool notify
|
||||
|
||||
void RandRCrtc::handleEvent(XRRCrtcChangeNotifyEvent *event)
|
||||
{
|
||||
+#if 0
|
||||
kdDebug() << "[CRTC] Event..." << endl;
|
||||
int changed = 0;
|
||||
|
||||
@@ -164,6 +167,7 @@ void RandRCrtc::handleEvent(XRRCrtcChang
|
||||
|
||||
if (changed)
|
||||
emit crtcChanged(m_id, changed);
|
||||
+#endif
|
||||
}
|
||||
|
||||
RRMode RandRCrtc::mode() const
|
||||
@@ -241,6 +245,7 @@ bool RandRCrtc::applyProposed()
|
||||
return false;
|
||||
|
||||
RROutput *outputs = new RROutput[m_connectedOutputs.count()];
|
||||
+ int connectedCount = m_connectedOutputs.count();
|
||||
for (int i = 0; i < m_connectedOutputs.count(); ++i)
|
||||
outputs[i] = m_connectedOutputs[i];
|
||||
|
||||
@@ -261,7 +266,7 @@ bool RandRCrtc::applyProposed()
|
||||
if (!m_screen->rect().contains(r))
|
||||
{
|
||||
// try to adjust the screen size
|
||||
- if (!m_screen->adjustSize(r))
|
||||
+ if (!adjustScreenSize(r, true))
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -279,7 +284,7 @@ bool RandRCrtc::applyProposed()
|
||||
|
||||
// adjust the screen size
|
||||
r = r.unite(m_currentRect);
|
||||
- if (!m_screen->adjustSize(r))
|
||||
+ if (!adjustScreenSize(r,true))
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -287,7 +292,7 @@ bool RandRCrtc::applyProposed()
|
||||
|
||||
Status s = XRRSetCrtcConfig(qt_xdisplay(), m_screen->resources(), m_id,
|
||||
RandR::timestamp, m_proposedRect.x(), m_proposedRect.y(), mode.id(),
|
||||
- m_proposedRotation, outputs, m_connectedOutputs.count());
|
||||
+ m_proposedRotation, outputs, connectedCount);
|
||||
|
||||
bool ret;
|
||||
if (s == RRSetConfigSuccess)
|
||||
@@ -424,6 +429,19 @@ ModeList RandRCrtc::modes() const
|
||||
return modeList;
|
||||
}
|
||||
|
||||
+bool RandRCrtc::adjustScreenSize(const QRect &rect, bool disable)
|
||||
+{
|
||||
+ if (disable)
|
||||
+ {
|
||||
+ // disable the crtc before changing screen size
|
||||
+ Status s = XRRSetCrtcConfig(qt_xdisplay(), m_screen->resources(), m_id,
|
||||
+ RandR::timestamp, 0, 0, None,
|
||||
+ RandR::Rotate0, NULL, 0);
|
||||
+ }
|
||||
+
|
||||
+ return m_screen->adjustSize(rect);
|
||||
+}
|
||||
+
|
||||
#include "randrcrtc.moc"
|
||||
|
||||
#endif
|
||||
diff -p -up krandr-0.5.2.1/randr/randroutput.cpp.orig krandr-0.5.2.1/randr/randroutput.cpp
|
||||
--- krandr-0.5.2.1/randr/randroutput.cpp.orig 2008-03-28 16:14:56.000000000 -0300
|
||||
+++ krandr-0.5.2.1/randr/randroutput.cpp 2008-03-28 16:15:18.000000000 -0300
|
||||
@@ -107,6 +107,7 @@ void RandROutput::loadSettings(bool noti
|
||||
|
||||
void RandROutput::handleEvent(XRROutputChangeNotifyEvent *event)
|
||||
{
|
||||
+#if 0
|
||||
int changed = 0;
|
||||
|
||||
if (event->crtc != m_currentCrtc)
|
||||
@@ -141,6 +142,7 @@ void RandROutput::handleEvent(XRROutputC
|
||||
|
||||
if (changed)
|
||||
emit outputChanged(m_id, changed);
|
||||
+#endif
|
||||
}
|
||||
|
||||
void RandROutput::handlePropertyEvent(XRROutputPropertyNotifyEvent *event)
|
||||
diff -p -up krandr-0.5.2.1/randr/randrcrtc.h.orig krandr-0.5.2.1/randr/randrcrtc.h
|
||||
--- krandr-0.5.2.1/randr/randrcrtc.h.orig 2008-03-28 14:24:07.000000000 -0300
|
||||
+++ krandr-0.5.2.1/randr/randrcrtc.h 2008-03-28 14:27:15.000000000 -0300
|
||||
@@ -62,6 +62,8 @@ public:
|
||||
|
||||
ModeList modes() const;
|
||||
|
||||
+ bool adjustScreenSize(const QRect &rect, bool disableCrtc = false);
|
||||
+
|
||||
signals:
|
||||
void crtcChanged(RRCrtc c, int changes);
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
--- krandr-0.5.2.1/randr/krandrtray.cpp.run_startup 2007-10-02 20:22:50.000000000 -0300
|
||||
+++ krandr-0.5.2.1/randr/krandrtray.cpp 2007-10-02 20:29:49.000000000 -0300
|
||||
@@ -48,6 +48,7 @@ KRandRSystemTray::KRandRSystemTray(RandR
|
||||
KConfig cfg("kcmrandrrc");
|
||||
cfg.setGroup("General");
|
||||
|
||||
+ m_runStartup = cfg.readBoolEntry("AutoStart", true);
|
||||
KGlobalAccel *accel = new KGlobalAccel(this);
|
||||
accel->insert( "DisplaySwitch", i18n("Switch displays"),
|
||||
i18n("Switch between active displays."),
|
||||
@@ -111,6 +112,10 @@ void KRandRSystemTray::contextMenuAboutT
|
||||
|
||||
menu->insertSeparator();
|
||||
|
||||
+ lastIndex = menu->insertItem(i18n( "Start KRandR when KDE starts" ));
|
||||
+ menu->connectItem(lastIndex, this, SLOT(slotToggleRunStartup()));
|
||||
+ menu->setItemChecked( lastIndex, m_runStartup );
|
||||
+
|
||||
KAction *actPrefs = new KAction( i18n( "Configure Display..." ),
|
||||
SmallIconSet( "configure" ), KShortcut(), this, SLOT( slotPrefs() ),
|
||||
actionCollection() );
|
||||
@@ -469,6 +474,15 @@ void KRandRSystemTray::slotPrefs()
|
||||
kcm->exec();
|
||||
}
|
||||
|
||||
+void KRandRSystemTray::slotToggleRunStartup()
|
||||
+{
|
||||
+ m_runStartup = !m_runStartup;
|
||||
+ KConfig cfg("kcmrandrrc");
|
||||
+
|
||||
+ cfg.setGroup("General");
|
||||
+ cfg.writeEntry("AutoStart", m_runStartup);
|
||||
+}
|
||||
+
|
||||
void KRandRSystemTray::slotSwitchDisplay()
|
||||
{
|
||||
m_display->switchOutput();
|
||||
--- krandr-0.5.2.1/randr/krandrtray.h.run_startup 2007-10-02 20:22:50.000000000 -0300
|
||||
+++ krandr-0.5.2.1/randr/krandrtray.h 2007-10-02 20:22:50.000000000 -0300
|
||||
@@ -46,6 +46,7 @@ protected slots:
|
||||
void slotOrientationChanged(int parameter);
|
||||
void slotRefreshRateChanged(int parameter);
|
||||
void slotPrefs();
|
||||
+ void slotToggleRunStartup();
|
||||
|
||||
protected:
|
||||
void mousePressEvent( QMouseEvent *e );
|
||||
@@ -62,6 +63,7 @@ private:
|
||||
bool m_popupUp;
|
||||
QValueList<KPopupMenu*> m_screenPopups;
|
||||
RandRDisplay *m_display;
|
||||
+ bool m_runStartup;
|
||||
};
|
||||
|
||||
#endif
|
||||
--- krandr-0.5.2.1/randr/krandrtray.desktop.run_startup 2007-10-02 20:42:22.000000000 -0300
|
||||
+++ krandr-0.5.2.1/randr/krandrtray.desktop 2007-10-02 20:29:27.000000000 -0300
|
||||
@@ -116,3 +116,4 @@ Icon=randr
|
||||
Type=Application
|
||||
OnlyShowIn=KDE;
|
||||
Categories=Qt;KDE;System;
|
||||
+X-KDE-autostart-condition=kcmrandrrc:General:AutoStart:true
|
||||
@ -1,28 +0,0 @@
|
||||
--- krandr-0.5.2.1/randr/krandrtray.cpp.orig 2007-09-17 17:12:03.000000000 -0300
|
||||
+++ krandr-0.5.2.1/randr/krandrtray.cpp 2007-09-17 17:16:35.000000000 -0300
|
||||
@@ -383,7 +383,7 @@ void KRandRSystemTray::populateRates(KPo
|
||||
RateList::const_iterator it;
|
||||
for (it = rates.begin(); it != rates.end(); ++it)
|
||||
{
|
||||
- lastIndex = menu->insertItem(i18n("%1 Hz", QString::number(*it, 'f', 1)));
|
||||
+ lastIndex = menu->insertItem(i18n("%1 Hz").arg(QString::number(*it, 'f', 1)));
|
||||
menu->setItemParameter(lastIndex, i);
|
||||
if (*it == rate)
|
||||
menu->setItemChecked(lastIndex, true);
|
||||
--- krandr-0.5.2.1/randr/legacyrandrscreen.cpp.orig 2007-09-17 17:24:23.000000000 -0300
|
||||
+++ krandr-0.5.2.1/randr/legacyrandrscreen.cpp 2007-09-17 17:25:12.000000000 -0300
|
||||
@@ -246,12 +246,12 @@ QStringList LegacyRandRScreen::refreshRa
|
||||
|
||||
QString LegacyRandRScreen::refreshRateDirectDescription(int rate) const
|
||||
{
|
||||
- return i18n("Refresh rate in Hertz (Hz)", "%1 Hz", rate);
|
||||
+ return i18n("%1 Hz").arg(rate);
|
||||
}
|
||||
|
||||
QString LegacyRandRScreen::refreshRateIndirectDescription(int size, int index) const
|
||||
{
|
||||
- return i18n("Refresh rate in Hertz (Hz)", "%1 Hz", refreshRateIndexToHz(size, index));
|
||||
+ return i18n("%1 Hz").arg(refreshRateIndexToHz(size, index));
|
||||
}
|
||||
|
||||
QString LegacyRandRScreen::refreshRateDescription(int size, int index) const
|
||||
@ -1,43 +0,0 @@
|
||||
diff -p -up krandr-0.5.2.1/randr/randrcrtc.cpp.orig krandr-0.5.2.1/randr/randrcrtc.cpp
|
||||
--- krandr-0.5.2.1/randr/randrcrtc.cpp.orig 2008-05-15 13:45:35.000000000 -0300
|
||||
+++ krandr-0.5.2.1/randr/randrcrtc.cpp 2008-05-15 13:44:02.000000000 -0300
|
||||
@@ -202,6 +202,7 @@ bool RandRCrtc::applyProposed()
|
||||
|
||||
// Grab server while messing around
|
||||
XGrabServer(qt_xdisplay());
|
||||
+ XFlush(qt_xdisplay());
|
||||
|
||||
RandRMode mode;
|
||||
if (m_proposedRect.size() == m_currentRect.size() && m_proposedRate == m_currentRate)
|
||||
@@ -248,6 +249,7 @@ bool RandRCrtc::applyProposed()
|
||||
else if (!mode.isValid())
|
||||
{
|
||||
XUngrabServer(qt_xdisplay());
|
||||
+ XFlush(qt_xdisplay());
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -268,6 +270,7 @@ bool RandRCrtc::applyProposed()
|
||||
if (r.width() > m_screen->maxSize().width() || r.height() > m_screen->maxSize().height())
|
||||
{
|
||||
XUngrabServer(qt_xdisplay());
|
||||
+ XFlush(qt_xdisplay());
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -279,6 +282,7 @@ bool RandRCrtc::applyProposed()
|
||||
if (!adjustScreenSize(r, true))
|
||||
{
|
||||
XUngrabServer(qt_xdisplay());
|
||||
+ XFlush(qt_xdisplay());
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -331,6 +335,7 @@ bool RandRCrtc::applyProposed()
|
||||
|
||||
m_screen->adjustSize();
|
||||
XUngrabServer(qt_xdisplay());
|
||||
+ XFlush(qt_xdisplay());
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
diff -p -up krandr-0.5.2.1/randr/randrcrtc.cpp.orig krandr-0.5.2.1/randr/randrcrtc.cpp
|
||||
--- krandr-0.5.2.1/randr/randrcrtc.cpp.orig 2008-03-31 15:52:59.000000000 -0300
|
||||
+++ krandr-0.5.2.1/randr/randrcrtc.cpp 2008-03-31 15:56:11.000000000 -0300
|
||||
@@ -199,6 +199,10 @@ bool RandRCrtc::applyProposed()
|
||||
for (int i = 0; i < m_connectedOutputs.count(); ++i)
|
||||
kdDebug() << " - " << m_screen->output(m_connectedOutputs[i])->name() << endl;
|
||||
#endif
|
||||
+
|
||||
+ // Grab server while messing around
|
||||
+ XGrabServer(qt_xdisplay());
|
||||
+
|
||||
RandRMode mode;
|
||||
if (m_proposedRect.size() == m_currentRect.size() && m_proposedRate == m_currentRate)
|
||||
{
|
||||
@@ -242,7 +246,10 @@ bool RandRCrtc::applyProposed()
|
||||
if (!m_connectedOutputs.count())
|
||||
mode = RandRMode();
|
||||
else if (!mode.isValid())
|
||||
+ {
|
||||
+ XUngrabServer(qt_xdisplay());
|
||||
return false;
|
||||
+ }
|
||||
|
||||
RROutput *outputs = new RROutput[m_connectedOutputs.count()];
|
||||
int connectedCount = m_connectedOutputs.count();
|
||||
@@ -259,7 +266,10 @@ bool RandRCrtc::applyProposed()
|
||||
{
|
||||
QRect r = QRect(0,0,0,0).unite(m_proposedRect);
|
||||
if (r.width() > m_screen->maxSize().width() || r.height() > m_screen->maxSize().height())
|
||||
+ {
|
||||
+ XUngrabServer(qt_xdisplay());
|
||||
return false;
|
||||
+ }
|
||||
|
||||
// if the desired mode is bigger than the current screen size, first change the
|
||||
// screen size, and then the crtc size
|
||||
@@ -267,7 +277,10 @@ bool RandRCrtc::applyProposed()
|
||||
{
|
||||
// try to adjust the screen size
|
||||
if (!adjustScreenSize(r, true))
|
||||
+ {
|
||||
+ XUngrabServer(qt_xdisplay());
|
||||
return false;
|
||||
+ }
|
||||
}
|
||||
|
||||
}
|
||||
@@ -280,12 +293,18 @@ bool RandRCrtc::applyProposed()
|
||||
// check if the rotated rect is smaller than the max screen size
|
||||
r = m_screen->rect().unite(r);
|
||||
if (r.width() > m_screen->maxSize().width() || r.height() > m_screen->maxSize().height())
|
||||
+ {
|
||||
+ XUngrabServer(qt_xdisplay());
|
||||
return false;
|
||||
+ }
|
||||
|
||||
// adjust the screen size
|
||||
r = r.unite(m_currentRect);
|
||||
if (!adjustScreenSize(r,true))
|
||||
+ {
|
||||
+ XUngrabServer(qt_xdisplay());
|
||||
return false;
|
||||
+ }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -311,6 +330,7 @@ bool RandRCrtc::applyProposed()
|
||||
}
|
||||
|
||||
m_screen->adjustSize();
|
||||
+ XUngrabServer(qt_xdisplay());
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
--- krandr-0.5.2.1/randr/randrdisplay.cpp.orig 2007-09-12 11:00:50.000000000 -0300
|
||||
+++ krandr-0.5.2.1/randr/randrdisplay.cpp 2007-09-12 11:05:15.000000000 -0300
|
||||
@@ -64,6 +64,27 @@ RandRDisplay::RandRDisplay()
|
||||
m_legacyScreens.append(new LegacyRandRScreen(i));
|
||||
}
|
||||
|
||||
+#ifdef HAS_RANDR_1_2
|
||||
+ // check if we have more than one output, if no, revert to the legacy behavior
|
||||
+ if (RandR::has_1_2)
|
||||
+ {
|
||||
+ int count = 0;
|
||||
+ for (int i = 0; i < m_numScreens; ++i)
|
||||
+ count += m_screens[i]->outputs().count();
|
||||
+
|
||||
+ if (count < 2)
|
||||
+ {
|
||||
+ RandR::has_1_2 = false;
|
||||
+ for (int i = 0; i < m_numScreens; ++i)
|
||||
+ {
|
||||
+ delete m_screens[i];
|
||||
+ m_legacyScreens.append(new LegacyRandRScreen(i));
|
||||
+ }
|
||||
+ m_screens.clear();
|
||||
+ }
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
setCurrentScreen(QApplication::desktop()->primaryScreen());
|
||||
}
|
||||
|
||||
Binary file not shown.
@ -1,12 +0,0 @@
|
||||
--- krozat/krozat.cpp.orig 2009-11-17 13:40:31.000000000 +0000
|
||||
+++ krozat/krozat.cpp 2009-11-17 13:50:20.000000000 +0000
|
||||
@@ -849,7 +849,8 @@
|
||||
|
||||
if (!mImage.load(fpath))
|
||||
{
|
||||
- printf(i18n("Failed to load image \"%1\"\n").arg(fpath).local8Bit());
|
||||
+ /***Adding %s seems to fix this - I hope. tmw***/
|
||||
+ printf("%s", i18n("Failed to load image \"%1\"\n").arg(fpath).local8Bit());
|
||||
mFileList.remove(fname);
|
||||
if (!mFileList.isEmpty())
|
||||
loadNextImage();
|
||||
@ -1,11 +0,0 @@
|
||||
--- krozat/krozat.cpp.orig 2011-07-22 15:28:02.429285443 +0100
|
||||
+++ krozat/krozat.cpp 2011-07-22 15:28:06.356282951 +0100
|
||||
@@ -78,7 +78,7 @@
|
||||
time(&t);
|
||||
srand((unsigned int)t);
|
||||
|
||||
- KImageIO::registerFormats();
|
||||
+ //KImageIO::registerFormats();
|
||||
|
||||
//blank();
|
||||
|
||||
@ -1,266 +0,0 @@
|
||||
%define effect_version 0.1
|
||||
Summary: Default Mandriva Linux screensaver for KDE
|
||||
Name: krozat
|
||||
Version: 2008.1.6
|
||||
Release: %mkrel 8
|
||||
Epoch: 2
|
||||
License: GPL
|
||||
URL: http://www.mandrivalinux.com/
|
||||
|
||||
# get the source from our cvs repository (see
|
||||
# http://qa.mandriva.com/twiki/bin/view/Main/CvsGuide)
|
||||
# no extra source or patch are allowed here.
|
||||
Source: krozat-%{version}.tar.bz2
|
||||
Source1: krozat-effect-%{effect_version}.tar.bz2
|
||||
Patch0 : krozat-printf.patch
|
||||
Patch1: krozat-trinity.patch
|
||||
|
||||
BuildRoot: %_tmppath/%name-%version-%release-root
|
||||
BuildRequires: X11-devel
|
||||
BuildRequires: arts-devel
|
||||
BuildRequires: fam-devel
|
||||
BuildRequires: kdelibs-devel
|
||||
BuildRequires: libart_lgpl-devel
|
||||
BuildRequires: jpeg-devel
|
||||
BuildRequires: png-devel
|
||||
BuildRequires: qt3-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: intltool
|
||||
# requires qt4 for the effect generation tool
|
||||
BuildRequires: qt4-devel
|
||||
|
||||
Summary: Default Mandriva Linux screensaver for KDE
|
||||
Group: Graphical desktop/KDE3
|
||||
Requires: kdebase-progs
|
||||
Requires: mandriva-theme-screensaver
|
||||
|
||||
%description
|
||||
This package contains the default Mandriva Linux screensaver for KDE.
|
||||
|
||||
%prep
|
||||
|
||||
%setup -q -a 1
|
||||
%patch0 -p0
|
||||
find . -type 'd' -name 'CVS' | xargs rm -fr
|
||||
%patch1 -p0
|
||||
|
||||
%build
|
||||
%configure_kde3
|
||||
|
||||
%make
|
||||
|
||||
pushd krozat-effect-%{effect_version}
|
||||
qmake
|
||||
make
|
||||
popd
|
||||
|
||||
%install
|
||||
rm -rf %buildroot
|
||||
|
||||
%makeinstall_std
|
||||
%find_lang krozat
|
||||
|
||||
pushd krozat-effect-%{effect_version}
|
||||
mkdir -p %buildroot%_kde3_bindir
|
||||
cp krozat-effect %buildroot%_kde3_bindir
|
||||
popd
|
||||
|
||||
%clean
|
||||
rm -fr %buildroot
|
||||
|
||||
%files -f krozat.lang
|
||||
%defattr(-,root,root)
|
||||
#
|
||||
%_kde3_bindir/krozat.kss
|
||||
%_kde3_bindir/krozat-effect
|
||||
#
|
||||
#
|
||||
%dir %_kde3_datadir/applnk/System/
|
||||
%dir %_kde3_datadir/applnk/System/ScreenSavers/
|
||||
%_kde3_datadir/applnk/System/ScreenSavers/*.desktop
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 22 2011 Tim Williams <tim@my-place.org.uk> 2:2008.1.6-8mvt2010.2
|
||||
+ Rebuild for Trinity
|
||||
|
||||
* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 2:2008.1.6-7mvt2010.0
|
||||
+ Rebuild for MDV 2010.1
|
||||
|
||||
* Sun Jan 17 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2:2008.1.6-6mvt2010.0
|
||||
+ Fix group in specfile
|
||||
|
||||
* Tue Nov 17 2009 Tim Williams <tim@my-place.org.uk> 2:2008.1.6-5mdv2010.0
|
||||
+ Rebuild for MDV 2010.0
|
||||
|
||||
* Sat Nov 08 2008 Oden Eriksson <oeriksson@mandriva.com> 2:2008.1.6-4mdv2009.1
|
||||
+ Revision: 301006
|
||||
- rebuilt against new libxcb
|
||||
|
||||
* Tue Jun 17 2008 Thierry Vignaud <tvignaud@mandriva.com> 2:2008.1.6-3mdv2009.0
|
||||
+ Revision: 221993
|
||||
- rebuild
|
||||
|
||||
* Thu May 08 2008 Helio Chissini de Castro <helio@mandriva.com> 2:2008.1.6-2mdv2009.0
|
||||
+ Revision: 204750
|
||||
- Move to /opt
|
||||
|
||||
* Wed Mar 26 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008.1.6-1mdv2008.1
|
||||
+ Revision: 190515
|
||||
- New release fixing a string message in the config dialog (#38644)
|
||||
|
||||
* Tue Mar 11 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008.1.5-1mdv2008.1
|
||||
+ Revision: 186866
|
||||
- New release adding a fake desktop fading effect
|
||||
|
||||
* Wed Mar 05 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008.1.4-1mdv2008.1
|
||||
+ Revision: 180184
|
||||
- New release changing only the time the screensaver will wait on each image
|
||||
and the transition speed.
|
||||
|
||||
* Tue Mar 04 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008.1.3-1mdv2008.1
|
||||
+ Revision: 178440
|
||||
- New release enabling the setup option of the screensaver
|
||||
|
||||
* Tue Mar 04 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008.1.2-3mdv2008.1
|
||||
+ Revision: 178432
|
||||
- Add a effect generation tool to help users creating their own themes for the
|
||||
screensaver
|
||||
|
||||
* Thu Feb 28 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008.1.2-2mdv2008.1
|
||||
+ Revision: 176403
|
||||
- new release (2008.1.2) adding support for extra slideshow themes
|
||||
|
||||
* Mon Feb 18 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008.1.1-1mdv2008.1
|
||||
+ Revision: 171922
|
||||
- new release improving the crossfade effect
|
||||
|
||||
* Thu Feb 14 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008.1.0-1mdv2008.1
|
||||
+ Revision: 167780
|
||||
- new release adding the crossfade effect for the machines that are able to
|
||||
use it. For machines that don't have 2D acceleration, the screensaver will
|
||||
revert its behavior to the previous one.
|
||||
|
||||
* Thu Jan 03 2008 Oden Eriksson <oeriksson@mandriva.com> 2:2008.0.1-2mdv2008.1
|
||||
+ Revision: 141740
|
||||
- rebuilt against openldap-2.4.7 libs
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
- fix summary-ended-with-dot
|
||||
- buildrequires X11-devel instead of XFree86-devel
|
||||
|
||||
* Wed Sep 26 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008.0.1-1mdv2008.0
|
||||
+ Revision: 93139
|
||||
- new release fixing image downscaling.
|
||||
|
||||
* Mon Sep 24 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008.0-1mdv2008.0
|
||||
+ Revision: 92499
|
||||
- New release including a fix from Neoclust for the desktop file
|
||||
|
||||
* Fri Sep 21 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2:2008-1mdv2008.0
|
||||
+ Revision: 92021
|
||||
- new version fixing it for 2008.0
|
||||
- spec cleanup
|
||||
|
||||
+ Anssi Hannula <anssi@mandriva.org>
|
||||
- Import krozat
|
||||
|
||||
|
||||
|
||||
|
||||
* Sat Sep 16 2006 Laurent MONTEL <lmontel@mandriva.com> 2007-4
|
||||
- Fix requires
|
||||
|
||||
* Fri Sep 15 2006 Laurent MONTEL <lmontel@mandriva.com> 2007-3
|
||||
- Only show krozat in kde
|
||||
|
||||
* Wed May 10 2006 Laurent MONTEL <lmontel@mandriva.com> 2007-1mdk
|
||||
- Rebuild to generate category
|
||||
|
||||
* Tue Aug 30 2005 Laurent MONTEL <lmontel@mandriva.com> 2006-4mdk
|
||||
- Fix other color
|
||||
|
||||
* Tue Aug 30 2005 Laurent MONTEL <lmontel@mandriva.com> 2006-3mdk
|
||||
- Adapt background color to distro
|
||||
|
||||
* Tue Aug 16 2005 Laurent MONTEL <lmontel@mandriva.com> 2006-2mdk
|
||||
- Rebuild
|
||||
|
||||
* Mon Aug 15 2005 Laurent MONTEL <lmontel@mandriva.com> 2006-1mdk
|
||||
- Rebuild
|
||||
|
||||
* Wed Oct 13 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 10.1-3mdk
|
||||
- Fix translation pb (bug found by Gwenole)
|
||||
|
||||
* Wed Oct 06 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 10.1-2mdk
|
||||
- Updtae po
|
||||
|
||||
* Tue Aug 17 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 10.1-1mdk
|
||||
- Update po file
|
||||
|
||||
* Mon Jun 14 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 10.0-7mdk
|
||||
- Update version
|
||||
|
||||
* Mon Jun 14 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 10.0-6mdk
|
||||
- Rebuild with new gcc
|
||||
- Fix automake/autoconf
|
||||
- use %%mdkversion
|
||||
|
||||
* Fri Feb 27 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 10.0-6mdk
|
||||
- Update po file
|
||||
|
||||
* Fri Jan 09 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 10.0-5mdk
|
||||
- Fix requires (found by vdanen)
|
||||
|
||||
* Thu Jan 08 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 10.0-4mdk
|
||||
- Fix other mem leak
|
||||
|
||||
* Thu Jan 08 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 10.0-3mdk
|
||||
- Rebuild
|
||||
- update po file
|
||||
- Fix make clean
|
||||
- Fix mem leak
|
||||
|
||||
* Thu Dec 04 2003 Laurent MONTEL <lmontel@mandrakesoft.com> 10.0-2mdk
|
||||
- Translate po file
|
||||
|
||||
* Tue Dec 02 2003 Laurent MONTEL <lmontel@mandrakesoft.com> 10.0-1mdk
|
||||
- Add po file
|
||||
|
||||
* Tue Sep 02 2003 Laurent MONTEL <lmontel@mandrakesoft.com> 9.1-4mdk
|
||||
- Fix build
|
||||
|
||||
* Thu Jul 17 2003 Laurent MONTEL <lmontel@mandrakesoft.com> 9.1-3mdk
|
||||
- Rebuild
|
||||
|
||||
* Tue Dec 24 2002 Stefan van der Eijk <stefan@eijk.nu. 9.1-2mdk
|
||||
- BuildRequires: libart_lgpl2-devel
|
||||
|
||||
|
||||
* Tue Dec 17 2002 Laurent MONTEL <lmontel@mandrakesoft.com> 9.1-1mdk
|
||||
- 9.1
|
||||
|
||||
* Fri Oct 18 2002 Laurent MONTEL <lmontel@mandrakesoft.com> 9.0-7mdk
|
||||
- Rebuild
|
||||
|
||||
* Sat Aug 31 2002 Laurent MONTEL <lmontel@mandrakesoft.com> 9.0-6mdk
|
||||
- Fix about dialogbox
|
||||
|
||||
* Fri Aug 23 2002 Laurent MONTEL <lmontel@mandrakesoft.com> 9.0-5mdk
|
||||
- Fix MDK copyright.
|
||||
|
||||
* Wed Aug 14 2002 Laurent MONTEL <lmontel@mandrakesoft.com> 9.0-4mdk
|
||||
- Rebuild against new gcc-3.2
|
||||
|
||||
* Fri Aug 9 2002 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 9.0-3mdk
|
||||
- lib64 fixes, again. They were split to nihil when mandrake_desk was split
|
||||
|
||||
* Thu Aug 8 2002 Stefan van der Eijk <stefan@eijk.nu> 9.0-2mdk
|
||||
- BuildRequires
|
||||
|
||||
* Fri Aug 02 2002 Laurent MONTEL <lmontel@mandrakesoft.com> 9.0-1mdk
|
||||
- Initial package
|
||||
@ -1,31 +0,0 @@
|
||||
--- src/ksmoothdock.h.orig 2009-03-26 15:25:26.000000000 +0100
|
||||
+++ src/ksmoothdock.h 2009-03-26 15:27:13.000000000 +0100
|
||||
@@ -26,6 +26,8 @@
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
+#include <iostream>
|
||||
+#include <memory>
|
||||
#include <vector>
|
||||
|
||||
#include <qwidget.h>
|
||||
--- src/ksmoothdock.cpp.orig 2009-03-26 15:28:35.000000000 +0100
|
||||
+++ src/ksmoothdock.cpp 2009-03-26 15:28:53.000000000 +0100
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
#include <iostream>
|
||||
#include <iterator>
|
||||
+#include <typeinfo>
|
||||
|
||||
#include <qdir.h>
|
||||
|
||||
--- src/paraboliczoomstate.cpp.orig 2009-03-26 15:29:43.000000000 +0100
|
||||
+++ src/paraboliczoomstate.cpp 2009-03-26 15:30:38.000000000 +0100
|
||||
@@ -21,6 +21,7 @@
|
||||
|
||||
#include <iostream>
|
||||
#include <unistd.h>
|
||||
+#include <cstdlib>
|
||||
|
||||
#include <qapplication.h>
|
||||
#include <qbitmap.h>
|
||||
@ -1,147 +0,0 @@
|
||||
#See here :http://wiki.mandriva.com/en/Underlinking#Problems_introduced_by_--no-undefined
|
||||
%define _disable_ld_no_undefined 1
|
||||
|
||||
|
||||
%define name kde3-ktorrent
|
||||
%define oname ktorrent
|
||||
%define version 3.5.12
|
||||
%define rel 1
|
||||
%define kde3_miconsdir %_kde3_iconsdir/mini
|
||||
%define kde3_liconsdir %_kde3_iconsdir/large
|
||||
# Note that this package does not follow the library policy as the
|
||||
# main package includes the libktorrent shared object. This is done
|
||||
# because 1) the library is only used internally by ktorrent, and so
|
||||
# it does never need to be installed separately, and 2) the %major
|
||||
# follows %version, thus resulting in one unuseful library package
|
||||
# in every ktorrent version upgrade. The only downside of not
|
||||
# following the library policy on this particular package I know is
|
||||
# rpmlint going nuts.
|
||||
#
|
||||
# Feel free to flame me if you do not like this...
|
||||
# -Anssi
|
||||
|
||||
%define major %version
|
||||
|
||||
Summary: BitTorrent program for KDE
|
||||
Name: %{name}
|
||||
Version: %{version}
|
||||
Release: %mkrel %{rel}
|
||||
Group: Networking/File transfer
|
||||
License: GPLv2+
|
||||
Url: http://ktorrent.org/
|
||||
Source0: http://ktorrent.org/downloads/%{version}/%{oname}-%{version}.tar.bz2
|
||||
Patch0: ktorrent-fix-KBytesPerSecToString.diff
|
||||
Patch1: ktorrent-php-path.patch
|
||||
Patch2: kde-3.5.10-acinclude.patch
|
||||
#Patch3: fix_autotools.patch
|
||||
Patch7: kdebase-3.5.12-move-xdg-menu-dir.patch
|
||||
Patch8: kdebase-3.5.12-config.patch
|
||||
BuildRoot: %{_tmppath}/%{oname}-%{version}-%{release}-buildroot
|
||||
BuildRequires: kde3-macros
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
%else
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
%endif
|
||||
BuildRequires: automake >= 1.6.1
|
||||
BuildRequires: gmp-devel
|
||||
BuildRequires: kdelibs-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
Obsoletes: %{_lib}ktorrent0 %{_lib}ktorrent2.1 %{_lib}ktorrent2.1.1
|
||||
Obsoletes: %{_lib}ktorrent2.1.2 %{_lib}ktorrent2.1.3
|
||||
|
||||
%description
|
||||
KTorrent is a BitTorrent program for KDE. It's main features are:
|
||||
o Downloads torrent files
|
||||
o Upload speed capping, seeing that most people can't upload
|
||||
infinite amounts of data.
|
||||
o Internet searching using The Bittorrent website's search engine
|
||||
o UDP Trackers
|
||||
|
||||
%prep
|
||||
%setup -q -n %{oname}-%{version}
|
||||
%patch0
|
||||
%patch1
|
||||
%if %mdkversion >= 201000
|
||||
%patch2 -p1
|
||||
#%patch3 -p1
|
||||
%endif
|
||||
|
||||
%patch7 -p0
|
||||
%patch8 -p0
|
||||
|
||||
%build
|
||||
PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
|
||||
export xdg_menudir=%_sysconfdir/xdg/kde/menus
|
||||
make -f admin/Makefile.common
|
||||
%configure_kde3 --disable-debug \
|
||||
--enable-mt \
|
||||
--disable-static \
|
||||
--enable-shared \
|
||||
--disable-objprelink \
|
||||
--with-pic \
|
||||
--with-gnu-ld \
|
||||
--disable-embedded \
|
||||
--enable-fast-install=yes \
|
||||
--with-qt-dir=%{qt3dir} \
|
||||
--with-xinerama \
|
||||
--enable-final
|
||||
%make
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
%makeinstall_std
|
||||
|
||||
desktop-file-install --vendor="" \
|
||||
--add-category="P2P" \
|
||||
--dir %{buildroot}%_kde3_datadir/applications/kde \
|
||||
%{buildroot}%_kde3_datadir/applications/kde/ktorrent.desktop
|
||||
|
||||
install -m644 apps/ktorrent/hi16-app-ktorrent.png -D $RPM_BUILD_ROOT%kde3_miconsdir/%{oname}.png
|
||||
install -m644 apps/ktorrent/hi32-app-ktorrent.png -D $RPM_BUILD_ROOT%_kde3_iconsdir/%{oname}.png
|
||||
install -m644 apps/ktorrent/hi48-app-ktorrent.png -D $RPM_BUILD_ROOT%kde3_liconsdir/%{oname}.png
|
||||
|
||||
%find_lang %{oname}
|
||||
rm -f $RPM_BUILD_ROOT%_kde3_libdir/libktorrent.{so,la}
|
||||
|
||||
#Fix Conflictss with kdelibs-common
|
||||
rm -f $RPM_BUILD_ROOT%_kde3_datadir/mimelnk/application/x-bittorrent.desktop
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
%update_menus
|
||||
%update_desktop_database
|
||||
%update_icon_cache hicolor
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
%clean_menus
|
||||
%clean_desktop_database
|
||||
%clean_icon_cache hicolor
|
||||
%endif
|
||||
|
||||
%files -f %{oname}.lang
|
||||
%defattr(-,root,root)
|
||||
%doc AUTHORS README
|
||||
%_kde3_bindir/*
|
||||
%_kde3_libdir/kde3/*
|
||||
%_kde3_libdir/libktorrent-2.2.6.so
|
||||
%_kde3_datadir/services/*
|
||||
%_kde3_datadir/servicetypes/*
|
||||
%_kde3_datadir/apps/%{oname}
|
||||
%_kde3_datadir/applications/kde/%{oname}.desktop
|
||||
%_kde3_datadir/config.kcfg/*.kcfg
|
||||
%_kde3_iconsdir/hicolor/scalable/apps/%{oname}.svgz
|
||||
%kde3_miconsdir/%{oname}.png
|
||||
%_kde3_iconsdir/%{oname}.png
|
||||
%kde3_liconsdir/%{oname}.png
|
||||
%_kde3_iconsdir/hicolor/*/apps/*.png
|
||||
%_kde3_iconsdir/hicolor/*/mimetypes/*.png
|
||||
%_kde3_iconsdir/hicolor/*/mimetypes/*.svgz
|
||||
@ -1,15 +0,0 @@
|
||||
--- libktorrent/interfaces/functions.cpp.orig 2006-05-21 00:06:28.000000000 +0200
|
||||
+++ libktorrent/interfaces/functions.cpp 2006-05-21 00:06:54.000000000 +0200
|
||||
@@ -46,7 +46,11 @@
|
||||
QString KBytesPerSecToString(double speed,int precision)
|
||||
{
|
||||
KLocale* loc = KGlobal::locale();
|
||||
- return i18n("%1 KB/s").arg(loc->formatNumber(speed,precision));
|
||||
+ QString tmp = loc->formatNumber(speed,precision);
|
||||
+ if (tmp.startsWith("inf"))
|
||||
+ return i18n("%1 KB/sec").arg("> 0.0");
|
||||
+ else
|
||||
+ return i18n("%1 KB/sec").arg(tmp);
|
||||
}
|
||||
|
||||
QString DurationToString(Uint32 nsecs)
|
||||
@ -1,11 +0,0 @@
|
||||
--- plugins/webinterface/ktwebinterfaceplugin.kcfg.orig 2007-02-05 23:43:07.000000000 +0100
|
||||
+++ plugins/webinterface/ktwebinterfaceplugin.kcfg 2007-02-05 23:43:15.000000000 +0100
|
||||
@@ -26,7 +26,7 @@
|
||||
</entry>
|
||||
<entry name="phpExecutablePath" type ="String">
|
||||
<label>php executable path</label>
|
||||
- <default></default>
|
||||
+ <default>/usr/bin/php</default>
|
||||
</entry>
|
||||
|
||||
<entry name="username" type ="String">
|
||||
@ -1,94 +0,0 @@
|
||||
%define oname KVolumeOSD
|
||||
|
||||
Name: kde3-kvolumeosd
|
||||
Version: 0.1
|
||||
Release: %mkrel 6
|
||||
Summary: An application showing OSD to respond volume buttons
|
||||
License: GPLv2+
|
||||
Group: Graphical desktop/KDE3
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
URL: http://www.kde-apps.org/content/show.php?content=80354
|
||||
Source: http://www.kde-apps.org/CONTENT/content-files/80354-%{oname}-%{version}.tar.gz
|
||||
Patch0: kde-3.5.10-acinclude.patch
|
||||
Patch1: fix_autotools.patch
|
||||
BuildRequires: kde3-macros
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
BuildRequires: automake >= 1.6.1
|
||||
%else
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
BuildRequires: automake >= 1.11
|
||||
%endif
|
||||
BuildRequires: kdelibs-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
Requires: kdemultimedia-kmix
|
||||
|
||||
%description
|
||||
KVolumeOSD is a simple KDE application that runs in the background and
|
||||
responds to volume buttons by showing a little OSD. It delegates the
|
||||
actual job of adjusting the volume to KMix.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{oname}
|
||||
%if %mdkversion >= 201000
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
make -f Makefile.cvs
|
||||
%configure_kde3
|
||||
%make
|
||||
|
||||
%install
|
||||
rm -rf %buildroot
|
||||
%makeinstall_std
|
||||
|
||||
desktop-file-install --vendor='' --delete-original \
|
||||
--dir %buildroot%_kde3_datadir/applications/kde \
|
||||
--add-category='Audio;Mixer' \
|
||||
%buildroot%_kde3_datadir/applnk/Utilities/kvolumeosd.desktop
|
||||
|
||||
%clean
|
||||
rm -rf %buildroot
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post
|
||||
%{update_menus}
|
||||
%update_kde3_icon_cache hicolor
|
||||
|
||||
%postun
|
||||
%{clean_menus}
|
||||
%clean_kde3_icon_cache hicolor
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%{_kde3_bindir}/kvolumeosd
|
||||
%{_kde3_appsdir}/kvolumeosd
|
||||
%{_kde3_datadir}/doc/HTML/en/kvolumeosd
|
||||
%{_kde3_datadir}/applications/kde/*.desktop
|
||||
%{_kde3_iconsdir}/hicolor/*/apps/*
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jul 18 2011 Tim Williams <tim@my-place.org.uk> 0.1-6mdv2010.2
|
||||
+ Rebuild for Trinity
|
||||
|
||||
* Fri Jul 23 2010 Tim Williams <tim@my-place.org.uk> 0.1-5mdv2010.1
|
||||
+ Rebuild MDV 2010.1
|
||||
|
||||
* Sun Feb 14 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.1-4mvt2010.0
|
||||
+ Fix build with autoconf 2.65 and automake 1.11
|
||||
+ Change package group
|
||||
|
||||
* Mon Nov 16 2009 Tim Williams <tim@my-place.org.uk> 0.1-3mdv2010.0
|
||||
+ Rebuild MDV 2010.0
|
||||
|
||||
* Fri May 09 2008 Funda Wang <fundawang@mandriva.org> 0.1-2mdv2009.0
|
||||
+ Revision: 205328
|
||||
- fix post and postun script
|
||||
- fix name
|
||||
- import source and spec
|
||||
- Created package structure for kde3-kvolumeosd.
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
--- kdelibs-3.5.10/admin/configure.in.min~ 2008-08-19 22:28:39.000000000 +0200
|
||||
+++ kdelibs-3.5.10/admin/configure.in.min 2009-08-17 19:13:01.823156420 +0200
|
||||
@@ -44,6 +44,9 @@
|
||||
AM_CONFIG_HEADER(config.h) dnl at the distribution this done
|
||||
|
||||
dnl Checks for programs.
|
||||
+AC_PROG_CC
|
||||
+AC_PROG_CXX
|
||||
+
|
||||
AC_CHECK_COMPILERS
|
||||
AC_ENABLE_SHARED(yes)
|
||||
AC_ENABLE_STATIC(no)
|
||||
--- kdelibs-3.5.10/configure.in.in~ 2006-05-22 20:14:23.000000000 +0200
|
||||
+++ kdelibs-3.5.10/configure.in.in 2009-08-17 19:16:04.549804009 +0200
|
||||
@@ -25,6 +25,9 @@
|
||||
AM_CONFIG_HEADER(config.h) dnl at the distribution this done
|
||||
|
||||
dnl Checks for programs.
|
||||
+AC_PROG_CC
|
||||
+AC_PROG_CXX
|
||||
+
|
||||
AC_CHECK_COMPILERS
|
||||
AC_LIBLTDL_CONVENIENCE
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
diff -Naur kdelibs-3.5.10/admin/cvs.sh kdelibs-3.5.10-yeni/admin/cvs.sh
|
||||
--- kdelibs-3.5.10/admin/cvs.sh 2008-08-19 23:28:39.000000000 +0300
|
||||
+++ kdelibs-3.5.10-yeni/admin/cvs.sh 2010-01-01 21:30:35.039582467 +0200
|
||||
@@ -29,10 +29,10 @@
|
||||
|
||||
check_autotool_versions()
|
||||
{
|
||||
-required_autoconf_version="2.53 or newer"
|
||||
+required_autoconf_version="2.53 or newer up to 2.65"
|
||||
AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
|
||||
case $AUTOCONF_VERSION in
|
||||
- Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
|
||||
+ Autoconf*2.5* | autoconf*2.5* | autoconf*2.60 | autoconf*2.61 | autoconf*2.62 | autoconf*2.63 | autoconf*2.65 ) : ;;
|
||||
"" )
|
||||
echo "*** AUTOCONF NOT FOUND!."
|
||||
echo "*** KDE requires autoconf $required_autoconf_version"
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
|
||||
case $AUTOHEADER_VERSION in
|
||||
- Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
|
||||
+ Autoconf*2.5* | autoheader*2.5* | autoheader*2.60 | autoheader*2.61 | autoheader*2.62 | autoheader*2.63 | autoheader*2.65 ) : ;;
|
||||
"" )
|
||||
echo "*** AUTOHEADER NOT FOUND!."
|
||||
echo "*** KDE requires autoheader $required_autoconf_version"
|
||||
@@ -68,7 +68,7 @@
|
||||
echo "*** KDE requires automake $required_automake_version"
|
||||
exit 1
|
||||
;;
|
||||
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*)
|
||||
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11*)
|
||||
echo "*** $AUTOMAKE_STRING found."
|
||||
UNSERMAKE=no
|
||||
;;
|
||||
@ -1,66 +0,0 @@
|
||||
2009-12-10 Stepan Kasal <skasal@redhat.com>
|
||||
|
||||
The change of implementation of AC_REQUIRE in 2.64 caused a regression
|
||||
in the arts project.
|
||||
This can be fixed by shuffling some macro calls.
|
||||
|
||||
I suppose that most of this patch will not be needed with a future
|
||||
release of Autoconf.
|
||||
But the last chunk of this patch is a real bug in this source and
|
||||
should go upstream.
|
||||
|
||||
--- arts-1.5.10/admin/acinclude.m4.in 2008-08-20 18:07:05.000000000 +0200
|
||||
+++ arts-1.5.10/admin/acinclude.m4.in 2009-12-09 17:30:57.000000000 +0100
|
||||
@@ -3081,8 +3081,18 @@
|
||||
fi
|
||||
])
|
||||
|
||||
+AC_DEFUN([AC_CHECK_COMPILERS_CC],
|
||||
+[
|
||||
+ dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
|
||||
+ CFLAGS=" $CFLAGS"
|
||||
+ AC_PROG_CC
|
||||
+ CXXFLAGS=" $CXXFLAGS"
|
||||
+ AC_PROG_CXX
|
||||
+])
|
||||
+
|
||||
AC_DEFUN([AC_CHECK_COMPILERS],
|
||||
[
|
||||
+ AC_REQUIRE([AC_CHECK_COMPILERS_CC])
|
||||
AC_ARG_ENABLE(debug,
|
||||
AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
|
||||
[
|
||||
@@ -3141,11 +3151,6 @@
|
||||
[kde_use_profiling="no"]
|
||||
)
|
||||
|
||||
- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
|
||||
- CFLAGS=" $CFLAGS"
|
||||
-
|
||||
- AC_PROG_CC
|
||||
-
|
||||
AC_PROG_CPP
|
||||
|
||||
if test "$GCC" = "yes"; then
|
||||
@@ -3174,10 +3179,6 @@
|
||||
LDFLAGS=""
|
||||
fi
|
||||
|
||||
- CXXFLAGS=" $CXXFLAGS"
|
||||
-
|
||||
- AC_PROG_CXX
|
||||
-
|
||||
KDE_CHECK_FOR_BAD_COMPILER
|
||||
|
||||
if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
|
||||
@@ -3503,8 +3504,8 @@
|
||||
AC_REQUIRE([AC_LIBTOOL_DLOPEN])
|
||||
AC_REQUIRE([KDE_CHECK_LIB64])
|
||||
|
||||
-AC_OBJEXT
|
||||
-AC_EXEEXT
|
||||
+AC_REQUIRE([AC_OBJEXT])
|
||||
+AC_REQUIRE([AC_EXEEXT])
|
||||
|
||||
AM_PROG_LIBTOOL
|
||||
AC_LIBTOOL_CXX
|
||||
@ -1,12 +0,0 @@
|
||||
--- admin/configure.in.min.orig 2011-07-13 14:02:37.735906184 +0100
|
||||
+++ admin/configure.in.min 2011-07-13 14:03:14.916906166 +0100
|
||||
@@ -44,6 +44,9 @@
|
||||
AM_CONFIG_HEADER(config.h) dnl at the distribution this done
|
||||
|
||||
dnl Checks for programs.
|
||||
+AC_PROG_CC
|
||||
+AC_PROG_CXX
|
||||
+
|
||||
AC_CHECK_COMPILERS
|
||||
AC_ENABLE_SHARED(yes)
|
||||
AC_ENABLE_STATIC(no)
|
||||
@ -1,11 +0,0 @@
|
||||
--- admin/acinclude.m4.in.orig 2010-08-12 23:39:22.000000000 +0100
|
||||
+++ admin/acinclude.m4.in 2011-07-19 13:40:17.619311049 +0100
|
||||
@@ -527,7 +527,7 @@
|
||||
xdg_appsdir='\${datadir}/applications/kde'
|
||||
fi
|
||||
if test -z "$xdg_menudir"; then
|
||||
- xdg_menudir='\${sysconfdir}/xdg/menus'
|
||||
+ xdg_menudir='\${sysconfdir}/xdg/kde/menus'
|
||||
fi
|
||||
if test -z "$xdg_directorydir"; then
|
||||
xdg_directorydir='\${datadir}/desktop-directories'
|
||||
@ -1,2 +0,0 @@
|
||||
This directory contains some common patches which are applied to the majority
|
||||
of the Trinity sources.
|
||||
@ -1,13 +0,0 @@
|
||||
--- arts-1.5.3/mcop/mcoputils.cc 2005-12-22 21:20:23.000000000 -0200
|
||||
+++ arts-1.5.3/mcop/mcoputils.cc.new 2006-07-19 14:44:08.000000000 -0300
|
||||
@@ -371,7 +371,9 @@
|
||||
}
|
||||
if (!mcop_dir)
|
||||
{
|
||||
- arts_fatal("can't create mcop directory");
|
||||
+ return "Unable to create mcop directory";
|
||||
+
|
||||
+ // arts_fatal("can't create mcop directory");
|
||||
}
|
||||
string tmpdir = mcop_dir;
|
||||
return tmpdir+"/"+name;
|
||||
@ -1,70 +0,0 @@
|
||||
? flow/audioiooss.cc,v
|
||||
? flow/audioioossthreaded.cc,v
|
||||
Index: flow/Makefile.am
|
||||
===================================================================
|
||||
RCS file: /home/kde/arts/flow/Makefile.am,v
|
||||
retrieving revision 1.79
|
||||
diff -u -3 -p -r1.79 Makefile.am
|
||||
--- flow/Makefile.am 18 Nov 2004 20:19:59 -0000 1.79
|
||||
+++ flow/Makefile.am 25 Feb 2005 13:58:07 -0000
|
||||
@@ -9,7 +9,7 @@ lib_LTLIBRARIES = libartsflow_idl.la lib
|
||||
|
||||
libartsflow_idl_la_SOURCES = artsflow.cc
|
||||
libartsflow_idl_la_LDFLAGS = -no-undefined -version-info 1:0 $(all_libraries)
|
||||
-libartsflow_idl_la_LIBADD = $(top_builddir)/mcop/libmcop.la $(LIBPOSIX4)
|
||||
+libartsflow_idl_la_LIBADD = $(top_builddir)/mcop/libmcop.la $(LIBPOSIX4) -lresmgr
|
||||
|
||||
libartsflow_la_LIBADD = $(top_builddir)/mcop/libmcop.la libartsflow_idl.la $(top_builddir)/flow/gslpp/libgslpp.la $(LIBAUDIOFILE) $(LIBASOUND) $(LIBAUDIOIO) $(LIBOSSAUDIO) $(LIBAUDIONAS) $(LIBCSL) $(SGILIBAUDIO) $(LIBESD) $(LIBMAS) $(JACK_LIBADD) -lm \
|
||||
$(top_builddir)/flow/gsl/libgsl.la
|
||||
Index: flow/audioiooss.cc
|
||||
===================================================================
|
||||
RCS file: /home/kde/arts/flow/audioiooss.cc,v
|
||||
retrieving revision 1.17
|
||||
diff -u -3 -p -r1.17 audioiooss.cc
|
||||
--- flow/audioiooss.cc 20 Nov 2004 04:55:21 -0000 1.17
|
||||
+++ flow/audioiooss.cc 25 Feb 2005 13:58:07 -0000
|
||||
@@ -49,6 +49,7 @@
|
||||
#include <assert.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
+#include <resmgr.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
@@ -157,7 +158,9 @@ bool AudioIOOSS::open()
|
||||
return false;
|
||||
}
|
||||
|
||||
- audio_fd = ::open(_deviceName.c_str(), mode, 0);
|
||||
+ audio_fd = ::rsm_open_device(_deviceName.c_str(), mode);
|
||||
+ if(audio_fd == -1)
|
||||
+ audio_fd = ::open(_deviceName.c_str(), mode, 0);
|
||||
|
||||
if(audio_fd == -1)
|
||||
{
|
||||
Index: flow/audioioossthreaded.cc
|
||||
===================================================================
|
||||
RCS file: /home/kde/arts/flow/audioioossthreaded.cc,v
|
||||
retrieving revision 1.6
|
||||
diff -u -3 -p -r1.6 audioioossthreaded.cc
|
||||
--- flow/audioioossthreaded.cc 20 Jan 2005 12:34:01 -0000 1.6
|
||||
+++ flow/audioioossthreaded.cc 25 Feb 2005 13:58:07 -0000
|
||||
@@ -50,6 +50,7 @@
|
||||
#include <assert.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
+#include <resmgr.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
@@ -202,7 +203,9 @@ bool AudioIOOSSThreaded::open()
|
||||
return false;
|
||||
}
|
||||
|
||||
- audio_fd = ::open(_deviceName.c_str(), mode, 0);
|
||||
+ audio_fd = ::rsm_open_device(_deviceName.c_str(), mode);
|
||||
+ if(audio_fd == -1)
|
||||
+ audio_fd = ::open(_deviceName.c_str(), mode, 0);
|
||||
|
||||
if(audio_fd == -1)
|
||||
{
|
||||
@ -1,20 +0,0 @@
|
||||
--- arts-1.5.9/mcop/mcoputils.cc.orig 2008-06-02 09:28:23.000000000 -0300
|
||||
+++ arts-1.5.9/mcop/mcoputils.cc 2008-06-02 09:28:42.000000000 -0300
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <sys/types.h>
|
||||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
+#include <limits.h>
|
||||
#include <netdb.h>
|
||||
#include <errno.h>
|
||||
#include <config.h>
|
||||
--- arts-1.5.9/artsc/artsdsp.c.orig 2008-06-02 09:27:24.000000000 -0300
|
||||
+++ arts-1.5.9/artsc/artsdsp.c 2008-06-02 09:27:52.000000000 -0300
|
||||
@@ -21,6 +21,7 @@
|
||||
*/
|
||||
|
||||
#define _GNU_SOURCE 1
|
||||
+#undef _FORTIFY_SOURCE
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
@ -1,347 +0,0 @@
|
||||
%define compile_apidox 1
|
||||
%{?_no_apidox: %{expand: %%global compile_apidox 0}}
|
||||
%define oname arts
|
||||
%define epoch_arts 30000001
|
||||
|
||||
# Define short-cuts for libification
|
||||
%define major 1
|
||||
|
||||
%define libname %mklibname arts %{major}
|
||||
|
||||
%define lib_name_orig libarts
|
||||
|
||||
Name: arts3
|
||||
Summary: Arts - Libraries
|
||||
Version: 1.5.12
|
||||
Release: %mkrel 1
|
||||
Epoch: %{epoch_arts}
|
||||
Group: Graphical desktop/KDE3
|
||||
License: ARTISTIC BSD GPL_V2 LGPL_V2 QPL_V1.0
|
||||
BuildRoot: %_tmppath/%name-%version-%release-root
|
||||
Requires(pre): %{libname} = %{epoch_arts}:%version-%release
|
||||
URL: http://www.kde.org
|
||||
Source: ftp://ftp.kde.org/pub/kde/stable/%version/src/%oname-%version.tar.bz2
|
||||
Patch0: arts-1.5.3-resmgr.patch
|
||||
Patch2: arts-1.5.3-mcop-msgkill.patch
|
||||
Patch4: arts-1.5.9-gcc4.3.x-compile.patch
|
||||
Patch5: kde-3.5.10-acinclude.patch
|
||||
BuildRequires: kde3-macros
|
||||
BuildRequires: audiofile-devel
|
||||
BuildRequires: qt3-devel
|
||||
BuildRequires: glib2-devel
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: resmgr-devel
|
||||
BuildRequires: X11-devel
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
%endif
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
BuildRequires: esound-devel
|
||||
BuildRequires: multiarch-utils >= 1.0.3
|
||||
BuildRequires: jackit-devel
|
||||
BuildRequires: libvorbis-devel
|
||||
BuildRequires: libtqtinterface-devel >= 3.5.12
|
||||
BuildConflicts: mas-devel
|
||||
Obsoletes: aethera =< 0.9.3-5mdk
|
||||
Obsoletes: brahms =< 1.02-3mdk
|
||||
Obsoletes: dotNETStyle =< 0.9.2-2mdk
|
||||
Obsoletes: drivetweak-kde- =< 0.9.1-1mdk
|
||||
Obsoletes: guarddog =< 1.9.14-1mdk
|
||||
Obsoletes: k3b =< 0.5.1-2mdk
|
||||
Obsoletes: karchiver =< 2.0.5-3mdk
|
||||
Obsoletes: kdestudio =< 2.0.0-10mdk
|
||||
Obsoletes: kdevmon =< 0.4.5-2mdk
|
||||
Obsoletes: keduca =< 0.4-6mdk
|
||||
Obsoletes: keurocalc =< 0.5.8-1mdk
|
||||
Obsoletes: kfontinst =< 0.10-1mdk
|
||||
Obsoletes: kgesture =< 0.3-6mdk
|
||||
Obsoletes: kguitar =< 0.4-2mdk
|
||||
Obsoletes: kinkatta =< 1.00-1mdk
|
||||
Obsoletes: kmag =< 0.7-1mdk
|
||||
Obsoletes: kmymoney2 =< 0.4-1mdk
|
||||
Obsoletes: knetfilter =< 2.2.5-1mdk
|
||||
Obsoletes: komba2 =< 0.72-1mdk
|
||||
Obsoletes: koncd =< 1.0rc2-2mdk
|
||||
Obsoletes: konnector =< 0.5-4mdk
|
||||
Obsoletes: konverse =< 0.2-3mdk
|
||||
Obsoletes: kover =< 0.8.3-2mdk
|
||||
Obsoletes: kreatecd =< 1.1.0-2mdk
|
||||
Obsoletes: krpmbuilder =< 0.2.6-4mdk
|
||||
Obsoletes: krusader =< 1.01-1mdk
|
||||
Obsoletes: kshowmail =< 2.2.3-1mdk
|
||||
Obsoletes: ksnuffle =< 2.2-6mdk
|
||||
Obsoletes: ksplashml =< 0.92-1mdk
|
||||
Obsoletes: kstars =< 0.8.5-1mdk
|
||||
Obsoletes: kstocks =< 2.0.2-8mdk
|
||||
Obsoletes: ktexmaker2 =< 1.7-2mdk
|
||||
Obsoletes: ktouch =< 1.0-4mdk
|
||||
Obsoletes: kuickshow =< 0.8.2-3mdk
|
||||
Obsoletes: kwatch =< 2.2.0-1mdk
|
||||
Obsoletes: kwave =< 0.6.3-3mdk
|
||||
Obsoletes: kwintv =< 0.8.11-5mdk
|
||||
Obsoletes: kxicq2 =< 0.7.6-1mdk
|
||||
Obsoletes: kxmleditor =< 0.7.1-2mdk
|
||||
Obsoletes: libbrahms0 =< 1.02-3mdk
|
||||
Obsoletes: libkarchiver2 =< 2.0.5-3mdk
|
||||
Obsoletes: libkguitar1 =< 0.4-2mdk
|
||||
Obsoletes: libxmms-kde1 =< 6.5-5mdk
|
||||
Obsoletes: sakuraplayer =< 1.0.6-1mdk umlmodeller =< 1.0.3-5mdk
|
||||
Obsoletes: cervisia =< 1.4.1-7mdk
|
||||
Obsoletes: kbiff =< 3.5.4-3mdk
|
||||
Obsoletes: kcpuload =< 1.90-11mdk
|
||||
Obsoletes: kdbg =< 1.2.5-1mdk
|
||||
Obsoletes: kdeaddons3
|
||||
Obsoletes: kdeadmin3
|
||||
Obsoletes: kdeartwork3
|
||||
Obsoletes: kdebindings3
|
||||
Obsoletes: kdemultimedia3
|
||||
Obsoletes: kdemultimedia3-aktion
|
||||
Obsoletes: kdenetwork3
|
||||
Obsoletes: kdepim3
|
||||
Obsoletes: kdesdk3
|
||||
Obsoletes: kdetoys3
|
||||
Obsoletes: kdeutils3
|
||||
Obsoletes: kdevelop3
|
||||
Obsoletes: klogic =< 1.35-1mdk
|
||||
Obsoletes: klyx =< 2.0-17mdk
|
||||
Obsoletes: kmago =< 1.1.2-5mdk
|
||||
Obsoletes: knetload =< 1.91-8mdk
|
||||
Obsoletes: koffice =< 1.1.1-14mdk
|
||||
Obsoletes: kpl2 =< 2.3.0-1mdk
|
||||
Obsoletes: krootwarning =< 8.2-13mdk
|
||||
Obsoletes: krozat =< 8.2-13mdk
|
||||
Obsoletes: ksetiwatch =< 2.2.5-1mdk
|
||||
Obsoletes: ktelnet =< 0.7b1-13mdk
|
||||
Obsoletes: kvirc =< 2.1.1-5mdk
|
||||
Obsoletes: libqt2-devel =< 2.3.1-29mdk
|
||||
Obsoletes: licq-kde =< 1.0.4-2mdk
|
||||
Obsoletes: qt2-designer =< 2.3.1-29mdk
|
||||
Obsoletes: qtrans =< 0.1.1-7mdk
|
||||
Obsoletes: quanta =< 2.0.1-2mdk
|
||||
Obsoletes: kdelibs-sound
|
||||
Obsoletes: %{libname}-static-devel
|
||||
Obsoletes: arts3 < %{epoch_arts}:1.5.3
|
||||
Provides: arts3 = %{epoch_arts}:%version-%release
|
||||
BuildConflicts: unsermake
|
||||
Conflicts: arts < 30000001:1.5.10-4
|
||||
Provides: arts = %epoch_arts:%version-%release
|
||||
|
||||
%description
|
||||
aRts is a short form for "analog realtime synthesizer". The idea of the whole
|
||||
thing is to create/process sound using small modules which do certain tasks.
|
||||
These may be create a waveform (oscillators), play samples, filter data, add
|
||||
signals, perform effects like delay/flanger/chorus, or output the data to the
|
||||
soundcard.
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_bindir/artscat
|
||||
%_kde3_bindir/artsd
|
||||
%_kde3_bindir/artsplay
|
||||
%_kde3_bindir/artsshell
|
||||
%_kde3_bindir/artsdsp
|
||||
%_kde3_bindir/artsrec
|
||||
%_kde3_bindir/artswrapper
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
%package -n %{libname}
|
||||
Group: System/Libraries
|
||||
Summary: The libraries for arts
|
||||
Obsoletes: libarts2, libarts3
|
||||
Requires: libtqtinterface >= 3.5.12-1
|
||||
|
||||
%description -n %{libname}
|
||||
Libraries needed for arts.
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n %{libname} -p /sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %{libname} -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files -n %{libname}
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_libdir/*.la
|
||||
%_kde3_libdir/*.so.*
|
||||
%dir %_kde3_libdir/mcop/
|
||||
%_kde3_libdir/mcop/*
|
||||
%_sysconfdir/ld.so.conf.d/*
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
%package devel
|
||||
Group: Development/KDE and Qt
|
||||
Summary: Development files for arts
|
||||
Requires: %{libname} = %{epoch_arts}:%version-%release
|
||||
Obsoletes: %{_lib}arts1-devel
|
||||
Obsoletes: libarts2-devel
|
||||
Obsoletes: libarts3-devel
|
||||
Provides: arts-devel
|
||||
Provides: libarts-devel
|
||||
Conflicts: arts <= %epoch_arts:1.5.3-5mdv2007
|
||||
|
||||
%description devel
|
||||
Development libraries for arts.
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_bindir/artsc-config
|
||||
%multiarch %_kde3_bindir/*/artsc-config
|
||||
%_kde3_bindir/mcopidl
|
||||
%_kde3_libdir/*.so
|
||||
%_kde3_includedir/*
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q -n %oname-%version
|
||||
%patch0 -p0 -b .resmgr
|
||||
%patch2 -p1 -b .msgkill
|
||||
%patch4 -p1 -b .gcc4.3
|
||||
%patch5 -p1
|
||||
|
||||
%build
|
||||
# Patch from resmgr needs rebuild builsystem
|
||||
make -f admin/Makefile.common
|
||||
QTDIR=%qt3dir
|
||||
export QTDIR
|
||||
PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
|
||||
|
||||
%configure_kde3 \
|
||||
--without-nas \
|
||||
|
||||
%make
|
||||
|
||||
|
||||
%install
|
||||
rm -fr %buildroot
|
||||
|
||||
%makeinstall_std
|
||||
%multiarch_binaries $RPM_BUILD_ROOT%{_kde3_bindir}/artsc-config
|
||||
%multiarch_includes $RPM_BUILD_ROOT%{_kde3_includedir}/arts/gsl/gslconfig.h
|
||||
|
||||
install -d %buildroot/%_sysconfdir/ld.so.conf.d
|
||||
cat > %buildroot/%_sysconfdir/ld.so.conf.d/%{libname}.conf <<EOF
|
||||
%_kde3_libdir
|
||||
EOF
|
||||
|
||||
|
||||
%clean
|
||||
rm -fr %buildroot
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Feb 03 2011 Tim Williams <tim@my-place.org.uk> 30000001:1.5.12-11mdf2010.2
|
||||
+ Add Trinity KDE 3.5.12 sources
|
||||
+ Add libtqtinterface dependencies
|
||||
- Remove arts-1.5.0-check_tmp_dir.patch and fix_autotools.patch, no longer necessary
|
||||
|
||||
* Tue May 04 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 30000001:1.5.10-11mvt2010.1
|
||||
+ Rebuild
|
||||
|
||||
* Sat Jan 16 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 30000001:1.5.10-11mvt2010.0
|
||||
+ Use automake 1.11 and above
|
||||
+ Patch for built with autoconf 2.65
|
||||
+ Fix package group
|
||||
|
||||
* Tue Nov 14 2009 Tim Williams <tim@my-place.org.uk> 30000001:1.5.10-10mdv2010.0
|
||||
- Remove some of the obsoletes which are causing problems
|
||||
|
||||
* Fri Nov 13 2009 Tim Williams <tim@my-place.org.uk> 30000001:1.5.10-9mdv2010.0
|
||||
+ Rebuild for MDV 2010.0
|
||||
|
||||
* Sat Mar 28 2009 Anssi Hannula <anssi@mandriva.org> 30000001:1.5.10-8mdv2009.1
|
||||
+ Revision: 361978
|
||||
- fix apparent typo in provides/conflicts change of r356949
|
||||
|
||||
* Fri Mar 27 2009 Anssi Hannula <anssi@mandriva.org> 30000001:1.5.10-7mdv2009.1
|
||||
+ Revision: 361677
|
||||
- fix new obsolete for biarch
|
||||
|
||||
* Wed Mar 25 2009 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.10-6mdv2009.1
|
||||
+ Revision: 361121
|
||||
- The return of undead. Changing name from libarts1-devel to a real arts3-devel
|
||||
|
||||
* Tue Mar 17 2009 Nicolas Lécureuil <neoclust@mandriva.org> 30000001:1.5.10-5mdv2009.1
|
||||
+ Revision: 356949
|
||||
- Add provides
|
||||
|
||||
* Sun Mar 15 2009 Nicolas Lécureuil <neoclust@mandriva.org> 30000001:1.5.10-4mdv2009.1
|
||||
+ Revision: 355208
|
||||
- Remove old spec file
|
||||
- Update to new name
|
||||
- Change arts to arts3 ( kde3 reintroduction step 1 )
|
||||
|
||||
* Sat Feb 28 2009 Anssi Hannula <anssi@mandriva.org> 30000001:1.5.10-3mdv2009.1
|
||||
+ Revision: 345972
|
||||
- rebuild due to removed i586 binaries
|
||||
|
||||
* Sat Nov 08 2008 Adam Williamson <awilliamson@mandriva.org> 30000001:1.5.10-2mdv2009.1
|
||||
+ Revision: 300956
|
||||
- rebuild for xcb changes
|
||||
|
||||
* Tue Aug 26 2008 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.10-1mdv2009.0
|
||||
+ Revision: 276164
|
||||
- Update for probably the last upstream arts from kde3
|
||||
|
||||
* Wed Aug 06 2008 Thierry Vignaud <tvignaud@mandriva.com> 30000001:1.5.9-8mdv2009.0
|
||||
+ Revision: 264319
|
||||
- rebuild early 2009.0 package (before pixel changes)
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
|
||||
|
||||
* Mon Jun 02 2008 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.9-7mdv2009.0
|
||||
+ Revision: 214278
|
||||
- Fix compilations against gcc 4.3.x. Close bug https://qa.mandriva.com/show_bug.cgi?id=41171
|
||||
|
||||
+ Funda Wang <fundawang@mandriva.org>
|
||||
- rebuild for new qt3
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- Rebuild because of qt3 move
|
||||
|
||||
* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.9-3mdv2009.0
|
||||
+ Revision: 200792
|
||||
- Begin changes for kde. Time to go to /opt
|
||||
- Added arts.conf on ld.so.conf.d
|
||||
|
||||
* Sat Mar 22 2008 Nicolas Lécureuil <neoclust@mandriva.org> 30000001:1.5.9-2mdv2008.1
|
||||
+ Revision: 189485
|
||||
- Fix groups ( tks to pterjan)
|
||||
|
||||
* Thu Feb 14 2008 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.9-1mdv2008.1
|
||||
+ Revision: 167752
|
||||
- Last arts ever arrived. 1.5.9. This will be the last update for old codebase and closing the cycle of stable releases of KDE3
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- fix description-line-too-long
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
* Tue Oct 23 2007 Nicolas Lécureuil <neoclust@mandriva.org> 30000001:1.5.8-1mdv2008.1
|
||||
+ Revision: 101650
|
||||
- Arts 1.5.8 from kde 3.5.8
|
||||
- Add Patch5, it fixes problems between aRts and Knotify
|
||||
|
||||
+ Per Øyvind Karlsen <peroyvind@mandriva.org>
|
||||
- add buildconflict on unsermake as it gets used by default if installed and breaks building
|
||||
|
||||
+ Anssi Hannula <anssi@mandriva.org>
|
||||
- remove hardcoded packager tag
|
||||
|
||||
* Mon May 21 2007 Olivier Blin <oblin@mandriva.com> 30000001:1.5.7-2mdv2008.0
|
||||
+ Revision: 29295
|
||||
- build with esound support
|
||||
|
||||
* Wed May 16 2007 Helio Chissini de Castro <helio@mandriva.com> 30000001:1.5.7-1mdv2008.0
|
||||
+ Revision: 27452
|
||||
- 1.5.7 release
|
||||
|
||||
@ -1,116 +0,0 @@
|
||||
Name: kde3-macros
|
||||
Version: 3.5.12
|
||||
Release: %mkrel 1
|
||||
Group: Development/KDE and Qt
|
||||
Summary: Base install macros for kde 3
|
||||
Source: kde3.macros
|
||||
URL: http://www.mandriva.com
|
||||
License: GPL
|
||||
BuildArch: noarch
|
||||
Requires: rpm-manbo-setup-build >= 2-7
|
||||
BuildRoot: %{_tmppath}/%{name}-buildroot
|
||||
|
||||
%description
|
||||
Base install macros for kde 3
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%_sysconfdir/rpm/macros.d/kde3.macros
|
||||
|
||||
%install
|
||||
rm -rf %buildroot
|
||||
install -d -m 755 %buildroot%_sysconfdir/rpm/macros.d
|
||||
install -m 644 %SOURCE0 %buildroot%_sysconfdir/rpm/macros.d/
|
||||
|
||||
%clean
|
||||
rm -rf %buildroot
|
||||
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Feb 16 2011 Tim Williams <tim@my-place.org.uk> 3.5.12-1mvt2010.1
|
||||
+ Rebuild for Trinity 3.5.12
|
||||
+ Add extra-libs and extra-includes so build can find tqtinterface
|
||||
+ Add --enable-closure
|
||||
|
||||
* Mon Nov 16 2009 Tim Williams <tim@my-place.org.uk> 3.5.10-5mvt2010.1
|
||||
+ Rebuild for MDV 2010.1
|
||||
|
||||
* Mon Nov 16 2009 Tim Williams <tim@my-place.org.uk> 3.5.10-4mdv2010.0
|
||||
+ Rebuild for MDV 2010.0
|
||||
|
||||
* Mon Oct 27 2008 Funda Wang <fundawang@mandriva.org> 3.5.10-3mdv2009.1
|
||||
+ Revision: 297523
|
||||
- specify qt3 dir
|
||||
|
||||
* Wed Sep 24 2008 Funda Wang <fundawang@mandriva.org> 3.5.10-2mdv2009.0
|
||||
+ Revision: 287688
|
||||
- add libdir to pkgconfig dir
|
||||
|
||||
* Tue Sep 16 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.10-1mdv2009.0
|
||||
+ Revision: 285306
|
||||
- Update version and fix bug 43876 - /etc/profile.d/91kde3.sh should contain redefination of PKG_CONFIG_PATH
|
||||
|
||||
* Wed Aug 06 2008 Thierry Vignaud <tvignaud@mandriva.com> 3.5.9-15mdv2009.0
|
||||
+ Revision: 264759
|
||||
- rebuild early 2009.0 package (before pixel changes)
|
||||
|
||||
* Fri Jun 06 2008 Funda Wang <fundawang@mandriva.org> 3.5.9-14mdv2009.0
|
||||
+ Revision: 216405
|
||||
- Requires rpm-manbo-setup-build for %%before_configure
|
||||
|
||||
* Thu Jun 05 2008 Funda Wang <fundawang@mandriva.org> 3.5.9-13mdv2009.0
|
||||
+ Revision: 215104
|
||||
- change configure_kde3 to use %%before_configure
|
||||
|
||||
* Fri May 30 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-12mdv2009.0
|
||||
+ Revision: 213551
|
||||
- Proper new qtdir libraries
|
||||
|
||||
* Wed May 28 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-11mdv2009.0
|
||||
+ Revision: 212725
|
||||
- Revert of the previous commit
|
||||
|
||||
* Wed May 28 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-10mdv2009.0
|
||||
+ Revision: 212717
|
||||
- Fix macros
|
||||
|
||||
* Fri May 09 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-9mdv2009.0
|
||||
+ Revision: 205308
|
||||
- Fix typo
|
||||
|
||||
* Thu May 08 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-8mdv2009.0
|
||||
+ Revision: 204698
|
||||
- Add clean_kde3_icon_cache and update_kde3_icon_cache macros
|
||||
|
||||
* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-7mdv2009.0
|
||||
+ Revision: 200791
|
||||
- Yes, we need a copy. Sometimes we loose a lot of time that we don't have
|
||||
because some nitpicking pointing.
|
||||
|
||||
* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-6mdv2009.0
|
||||
+ Revision: 200553
|
||||
- Using again configure2_5x. Some impatient people can't wait some work in progress...
|
||||
|
||||
* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-4mdv2009.0
|
||||
+ Revision: 200535
|
||||
- Added xinerama and alsa
|
||||
|
||||
* Sat May 03 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-3mdv2009.0
|
||||
+ Revision: 200534
|
||||
- Added mitshm and enable-libfam
|
||||
|
||||
* Fri May 02 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-2mdv2009.0
|
||||
+ Revision: 200518
|
||||
- Created configure_kde macro to make kde3 build easier too like kde4 and make transition to /opt less painfull. Thanks to Blino for the help.
|
||||
There's no need anymore add all define switches, even for libsuffix detection, so if you want:
|
||||
- Disable enable-final: use --define _disable_final=1
|
||||
- Compile with debug full: use --define _unstable=1
|
||||
- Compile in non 32bits arch: No need add the usual lib test
|
||||
|
||||
* Sun Apr 13 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-1mdv2009.0
|
||||
+ Revision: 192655
|
||||
- import kde3-macros
|
||||
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
%use_enable_final %{!?_disable_final:--enable-final}
|
||||
%use_unstable %{?_unstable:--enable-debug=full}
|
||||
|
||||
%_kde3_prefix /opt/kde3
|
||||
%_kde3_libdir %_kde3_prefix/%_lib
|
||||
%_kde3_iconsdir %_kde3_prefix/share/icons
|
||||
%_kde3_sysconfdir %_sysconfdir
|
||||
%_kde3_datadir %_kde3_prefix/share
|
||||
%_kde3_configdir %_kde3_datadir/config
|
||||
%_kde3_appsdir %_kde3_datadir/apps
|
||||
%_kde3_docdir %_kde3_prefix/share/doc
|
||||
%_kde3_bindir %_kde3_prefix/bin
|
||||
%_kde3_sbindir %_kde3_prefix/sbin
|
||||
%_kde3_includedir %_kde3_prefix/include
|
||||
%_kde3_mandir %_kde3_prefix/share/man
|
||||
%_kde3_autostart %_kde3_prefix/share/autostart
|
||||
|
||||
%configure_kde3 \\\
|
||||
%before_configure ; \
|
||||
%{?_enable_libtoolize:%{?__libtoolize_configure:%{__libtoolize_configure};}} \
|
||||
[ -f $CONFIGURE_TOP/configure.in -o -f $CONFIGURE_TOP/configure.ac ] && \
|
||||
CONFIGURE_XPATH="--x-includes=%{_prefix}/include --x-libraries=%{_prefix}/%{_lib}" \
|
||||
PKG_CONFIG_PATH="%{_kde3_libdir}/pkgconfig:%{_libdir}/pkgconfig:${PKG_CONFIG_PATH}" \
|
||||
$CONFIGURE_TOP/configure --build=%{_target_platform} \\\
|
||||
--prefix=%{_kde3_prefix} \\\
|
||||
--bindir=%{_kde3_bindir} \\\
|
||||
--sbindir=%{_kde3_sbindir} \\\
|
||||
--sysconfdir=%{_sysconfdir} \\\
|
||||
--datadir=%{_kde3_datadir} \\\
|
||||
--includedir=%{_kde3_includedir} \\\
|
||||
--libdir=%{_kde3_libdir} %use_unstable %use_enable_final \\\
|
||||
--infodir=%{_infodir} \\\
|
||||
--mandir=%{_mandir} \\\
|
||||
--disable-static \\\
|
||||
--enable-mitshm \\\
|
||||
--with-ipv6-lookup=auto \\\
|
||||
--with-pic \\\
|
||||
--with-xinerama \\\
|
||||
--with-alsa \\\
|
||||
--enable-libfam \\\
|
||||
--enable-pcre \\\
|
||||
--with-qt-dir=%{qt3dir} --with-qt-includes=%{qt3include} --with-qt-libraries=%{qt3lib}\\\
|
||||
--with-extra-libs=%{_kde3_libdir} --with-extra-includes=%{_kde3_includedir}/tqt \\\
|
||||
%if "%{_lib}" != "lib" \
|
||||
--enable-libsuffix="%(A=%{_lib}; echo ${A/lib/})" \\\
|
||||
%endif \
|
||||
--disable-rpath \\\
|
||||
--enable-closure \\\
|
||||
$CONFIGURE_XPATH
|
||||
# Rebuild icon cache
|
||||
%update_kde3_icon_cache() if [ -x %{_update_icon_cache_bin} ]; then \
|
||||
%{_update_icon_cache_bin} --force --quiet %{_kde3_iconsdir}/%{1} || true; fi \
|
||||
%{nil}
|
||||
|
||||
%clean_kde3_icon_cache() if [ -x %{_update_icon_cache_bin} -a -r %{_kde3_iconsdir}/%{1}/index.theme ]; then \
|
||||
%{_update_icon_cache_bin} --force --quiet %{_kde3_iconsdir}/%{1} || true ; fi \
|
||||
%{nil}
|
||||
@ -1,135 +0,0 @@
|
||||
# TODO
|
||||
# - for some unknown reason to me it creates dead symlinks instead of libtqt shared library
|
||||
# libtool: install: /usr/bin/install -c -p .libs/libtqt.so.4.2.0 /tmp/xxx/usr/lib64/libtqt.so.4.2.0
|
||||
# /usr/bin/install: cannot stat `.libs/libtqt.so.4.2.0': No such file or directory
|
||||
# workarounded in spec r1.2 commit
|
||||
#
|
||||
# Conditional build:
|
||||
%bcond_with qt4 # Enable Qt4 support (this will disable all Qt3 support)
|
||||
|
||||
%define epoch_kdelibs 30000000
|
||||
|
||||
Summary: Interface and abstraction library for Qt and Trinity
|
||||
Name: libtqtinterface
|
||||
Version: 3.5.12
|
||||
Release: %mkrel 1
|
||||
#Epoch: %epoch_kdelibs
|
||||
License: GPL v2
|
||||
Group: Graphical desktop/KDE3
|
||||
Source0: http://mirror.its.uidaho.edu/pub/trinity/releases/%{version}/dependencies/tqtinterface-%{version}.tar.gz
|
||||
# Source0-md5: 361c45961184f01f95d3b771138c8229
|
||||
Patch0: tqt-comments.patch
|
||||
Patch1: tqglobal-comments.patch
|
||||
Patch2: tqt-r1217318.diff
|
||||
URL: http://trinity.pearsoncomputing.net/
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: libltdl-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: qt3-devel
|
||||
BuildRequires: sed >= 4.0
|
||||
#BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
|
||||
BuildRoot: %_tmppath/%name-%version-%release-root
|
||||
|
||||
|
||||
%description
|
||||
This package includes libraries that abstract the underlying Qt system
|
||||
from the actual Trinity code, allowing easy, complete upgrades to new
|
||||
versions of Qt.
|
||||
|
||||
It also contains various functions that have been removed from newer
|
||||
versions of Qt, but are completely portable and isolated from other
|
||||
APIs such as Xorg. This allows the Trinity project to efficiently
|
||||
perform certain operations that are infeasible or unneccessarily
|
||||
difficult when using pure Qt4 or above.
|
||||
|
||||
%package devel
|
||||
Summary: Header files for libtqtinterface library
|
||||
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libtqtinterface
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
Header files for libtqtinterface library.
|
||||
|
||||
%description devel -l pl.UTF-8
|
||||
Pliki nagłówkowe biblioteki libtqtinterface.
|
||||
|
||||
%prep
|
||||
%setup -qc
|
||||
mv dependencies/tqtinterface/* .
|
||||
%patch0 -p0
|
||||
%patch1 -p0
|
||||
%patch2 -p2
|
||||
|
||||
# libtool copy
|
||||
rm -r libltdl
|
||||
%{__sed} -i -e '/ltdl.m4/d' Makefile.am.in
|
||||
|
||||
# remove copy of QtCore and QtGui devel headers
|
||||
rm -r qtinterface/qt4 qtinterface/tqt4
|
||||
%{__sed} -i -e /tqt4/d qtinterface/Makefile.am
|
||||
|
||||
%build
|
||||
make -f admin/Makefile.common cvs
|
||||
|
||||
QTDIR=%qt3dir ; export QTDIR;
|
||||
PATH=%{qt3dir}/bin:$PATH; export PATH;
|
||||
export xdg_menudir=%_sysconfdir/xdg/kde/menus
|
||||
|
||||
%configure_kde3 \
|
||||
--includedir=%{_kde3_includedir}/tqt \
|
||||
%if "%{_lib}" == "lib64"
|
||||
--enable-libsuffix=64 \
|
||||
%endif
|
||||
%{?with_qt4:--enable-qt4}
|
||||
|
||||
%{__make} \
|
||||
LIBTOOL="%{_bindir}/libtool -v"
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
# force -j1 or USE_QTX is replaced _after_ file is installed
|
||||
%{__make} -j1 install \
|
||||
DESTDIR=$RPM_BUILD_ROOT \
|
||||
|
||||
# --disable-static did not work, rm it again
|
||||
#rm $RPM_BUILD_ROOT%{_libdir}/libtqt.a
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
%files
|
||||
%defattr(644,root,root,755)
|
||||
%attr(755,root,root) %{_kde3_libdir}/libtqt.so.*.*.*
|
||||
%attr(755,root,root) %{_kde3_libdir}/libtqt.a
|
||||
%ghost %attr(755,root,root) %{_kde3_libdir}/libtqt.so.4
|
||||
|
||||
%files devel
|
||||
%defattr(644,root,root,755)
|
||||
%doc AUTHORS COPYING README
|
||||
%attr(755,root,root) %{_kde3_bindir}/convert_qt_tqt1
|
||||
%attr(755,root,root) %{_kde3_bindir}/convert_qt_tqt2
|
||||
%attr(755,root,root) %{_kde3_bindir}/convert_qt_tqt3
|
||||
%attr(755,root,root) %{_kde3_bindir}/dcopidl-tqt
|
||||
%attr(755,root,root) %{_kde3_bindir}/dcopidl2cpp-tqt
|
||||
%attr(755,root,root) %{_kde3_bindir}/dcopidlng-tqt
|
||||
%attr(755,root,root) %{_kde3_bindir}/mcopidl-tqt
|
||||
%attr(755,root,root) %{_kde3_bindir}/moc-tqt
|
||||
%attr(755,root,root) %{_kde3_bindir}/tqt-replace
|
||||
%attr(755,root,root) %{_kde3_bindir}/tqt-replace-stream
|
||||
%dir %{_kde3_includedir}/tqt
|
||||
%{_kde3_includedir}/tqt/tq*.h
|
||||
%{_kde3_libdir}/libtqt.la
|
||||
%{_kde3_libdir}/libtqt.so
|
||||
|
||||
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
|
||||
%changelog
|
||||
* Wed Feb 1 2011 Tim Williams <tim@my-place.org.uk> 1:3.5.12-1mvf2010.2
|
||||
+ Rewrite for MDV 2010.2
|
||||
+ Spec based on revision 1.4 from PLD linux
|
||||
+ Add tqt-comments.patch, tqglobal-comments.patch. My compiler doesn't like // comments.
|
||||
@ -1,26 +0,0 @@
|
||||
--- qtinterface/tqglobal.h.orig 2011-02-04 12:35:10.215472605 +0000
|
||||
+++ qtinterface/tqglobal.h 2011-02-04 12:35:45.537474675 +0000
|
||||
@@ -26,18 +26,18 @@
|
||||
|
||||
#ifdef USE_QT3
|
||||
|
||||
-// Pull in all Qt3 global defines
|
||||
+/* Pull in all Qt3 global defines */
|
||||
|
||||
#include <qglobal.h>
|
||||
|
||||
-#endif // USE_QT3
|
||||
+#endif /* USE_QT3 */
|
||||
|
||||
#ifdef USE_QT4
|
||||
|
||||
-// Pull in all Qt4 global defines
|
||||
+/* Pull in all Qt4 global defines */
|
||||
|
||||
#include <Qt/qglobal.h>
|
||||
|
||||
-#endif // USE_QT4
|
||||
+#endif /* USE_QT4 */
|
||||
|
||||
#endif /* TQGLOBAL_H */
|
||||
\ No newline at end of file
|
||||
@ -1,23 +0,0 @@
|
||||
--- qtinterface/tqt.h.orig 2010-08-31 00:37:01.000000000 +0100
|
||||
+++ qtinterface/tqt.h 2011-02-03 13:48:47.483987570 +0000
|
||||
@@ -42,7 +42,7 @@
|
||||
#define TQT_METHOD(a) METHOD(a)
|
||||
#define TQT_SLOT(a) SLOT(a)
|
||||
#define TQT_SIGNAL(a) SIGNAL(a)
|
||||
-#endif // __cplusplus
|
||||
+#endif
|
||||
|
||||
#ifdef USE_QT3
|
||||
#define qint64 long
|
||||
@@ -1319,11 +1319,4 @@
|
||||
#define TQXmlDefaultHandler QXmlDefaultHandler
|
||||
#endif
|
||||
|
||||
-// Undo any damage caused by the tqt-replace utility
|
||||
-//#define QCStringList TQCStringList
|
||||
-//#define QtWIN TQtWIN
|
||||
-
|
||||
-//#include "kdemacros.h.in"
|
||||
-//#define TQT_EXPORT KDE_EXPORT
|
||||
-
|
||||
#endif /* TQT_H */
|
||||
@ -1,12 +0,0 @@
|
||||
Index: dependencies/tqtinterface/qtinterface/tqt.h
|
||||
===================================================================
|
||||
--- dependencies/tqtinterface/qtinterface/tqt.h (revision 1217317)
|
||||
+++ dependencies/tqtinterface/qtinterface/tqt.h (revision 1217318)
|
||||
@@ -85,6 +85,7 @@
|
||||
#define TQ_ControlButton ControlButton
|
||||
#define TQ_AltButton AltButton
|
||||
#define TQ_MetaButton MetaButton
|
||||
+#define TQ_WFlags TQt::WFlags
|
||||
#define TQIODevice_OpenModeFlag int
|
||||
|
||||
#define TQAlignCenter AlignCenter
|
||||
@ -1,35 +0,0 @@
|
||||
diff -Naur mandriva-kde-config-2009.0/kdm/backgroundrc mandriva-kde-config.yeni/kdm/backgroundrc
|
||||
--- mandriva-kde-config-2009.0/kdm/backgroundrc 2006-08-23 20:58:15.000000000 +0300
|
||||
+++ mandriva-kde-config.yeni/kdm/backgroundrc 2009-11-24 21:35:26.592448000 +0200
|
||||
@@ -13,6 +13,6 @@
|
||||
Program=
|
||||
ReverseBlending=false
|
||||
UseSHM=false
|
||||
-Wallpaper=/usr/share/mdk/backgrounds/default.png
|
||||
+Wallpaper=/usr/share/mdk/backgrounds/default.jpg
|
||||
WallpaperList=
|
||||
WallpaperMode=Scaled
|
||||
diff -Naur mandriva-kde-config-2009.0/kdm/kdmrc mandriva-kde-config.yeni/kdm/kdmrc
|
||||
--- mandriva-kde-config-2009.0/kdm/kdmrc 2008-06-23 21:03:31.000000000 +0300
|
||||
+++ mandriva-kde-config.yeni/kdm/kdmrc 2009-12-15 00:27:11.727822403 +0200
|
||||
@@ -451,7 +451,7 @@
|
||||
# The theme to use for the greeter. Can point to either a directory or an XML
|
||||
# file.
|
||||
# Default is ""
|
||||
-Theme=/usr/share/mdk/dm
|
||||
+Theme=/opt/kde3/share/config/kdm/themes/2010
|
||||
|
||||
# Core config for local displays
|
||||
[X-:*-Core]
|
||||
diff -Naur mandriva-kde-config-2009.0/kdm/themes/2008/2008.xml mandriva-kde-config.yeni/kdm/themes/2008/2008.xml
|
||||
--- mandriva-kde-config-2009.0/kdm/themes/2008/2008.xml 2007-09-12 01:17:40.000000000 +0300
|
||||
+++ mandriva-kde-config.yeni/kdm/themes/2008/2008.xml 2009-11-25 02:13:17.273313000 +0200
|
||||
@@ -2,7 +2,7 @@
|
||||
<!DOCTYPE greeter SYSTEM "greeter.dtd">
|
||||
<greeter>
|
||||
<item type="pixmap">
|
||||
- <normal file="/usr/share/mdk/backgrounds/default.png"/>
|
||||
+ <normal file="/usr/share/mdk/backgrounds/default.jpg"/>
|
||||
<pos x="0" y="0" width="100%" height="100%"/>
|
||||
</item>
|
||||
|
||||
Binary file not shown.
@ -1,907 +0,0 @@
|
||||
%define epoch_kdelibs 30000000
|
||||
%define oname mandriva-kde-config
|
||||
|
||||
Name: mandriva-kde3-config
|
||||
Summary: Mandriva KDE configuration
|
||||
Version: 2010.2
|
||||
Release: %mkrel 1
|
||||
URL: http://www.mandriva.com
|
||||
Group: Graphical desktop/KDE3
|
||||
BuildRoot: %_tmppath/%name-buildroot
|
||||
BuildRequires: kde3-macros
|
||||
Source0: %{oname}-%{version}.tar.bz2
|
||||
# OpenOffice.org icons. Should be in a separate package
|
||||
# in the future, since they're shared between kde, OOo
|
||||
# and maybe others
|
||||
Source1: ooo-icons.tar.bz2
|
||||
Source2: opendocument-mime.tar.bz2
|
||||
Patch0: fix_kdmtheme.patch
|
||||
License: GPL
|
||||
BuildArch: noarch
|
||||
Obsoletes: %{name} < %version-%release
|
||||
Obsoletes: mandriva-kde-config
|
||||
Provides: mandriva-kde-config = %version-%release
|
||||
|
||||
|
||||
%description
|
||||
This package regroups all specific Mandriva config file for KDE.
|
||||
(kicker config etc.)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package common
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: Common configs used for Mandriva theme
|
||||
Requires(pre): update-alternatives
|
||||
Requires: urw-fonts
|
||||
Obsoletes: %{name}-common < %version-%release
|
||||
Obsoletes: mandriva-kde-config-common
|
||||
Provides: mandriva-kde-config-common = %version-%release
|
||||
|
||||
%description common
|
||||
common configs used for Mandriva theme
|
||||
|
||||
%post common
|
||||
update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/common/upstream-kde-config 9
|
||||
|
||||
%postun common
|
||||
if ! [ -e /var/lib/mandriva/kde-profiles/common/upstream-kde-config ]; then
|
||||
update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/common/upstream-kde-config
|
||||
fi
|
||||
|
||||
%files common
|
||||
%defattr(0644,root,root,755)
|
||||
%dir %_localstatedir/lib/mandriva/
|
||||
%dir %_localstatedir/lib/mandriva/kde-profiles/common
|
||||
%_localstatedir/lib/mandriva/kde-profiles/common/*
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package -n powerpack-kde3-config
|
||||
Summary: Mandriva KDE configuration
|
||||
Group: Graphical desktop/KDE3
|
||||
Provides: kde-config-file = %version-%release
|
||||
Requires: mandriva-theme
|
||||
Requires: desktop-common-data
|
||||
Requires(pre): mandriva-kde-config-common = %version-%release
|
||||
Conflicts: kdelibs-common < %epoch_kdelibs:3.5.1
|
||||
Conflicts: kdebase-common < 1:3.5.2-10.1.20060mdk
|
||||
Obsoletes: mandriva-kde-config-file < 2008.0
|
||||
Obsoletes: powerpackplus-kde-config < 2008.0
|
||||
Provides: powerpack-kde-config = %version-%release
|
||||
Provides: powerpackplus-kde-config = %version-%release
|
||||
Obsoletes: powerpack-kde-config
|
||||
Requires(preun): mandriva-kde3-config-common
|
||||
Obsoletes: powerpack-kde3-config < %version-%release
|
||||
|
||||
%pre -n powerpack-kde3-config
|
||||
if [ "$1" = "2" ]; then
|
||||
[ ! -h %_sysconfdir/kderc ] && rm -f %_sysconfdir/kderc ]
|
||||
fi
|
||||
if [ -d %_localstatedir/lib/mandriva/kde-profiles/powerpack/share/apps/kdesktop/Desktop ]; then
|
||||
rm -rf %_localstatedir/lib/mandriva/kde-profiles/powerpack/share/apps/kdesktop/Desktop
|
||||
fi
|
||||
|
||||
%post -n powerpack-kde3-config
|
||||
update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/powerpack/kderc 10
|
||||
|
||||
%postun -n powerpack-kde3-config
|
||||
if ! [ -e /var/lib/mandriva/kde-profiles/powerpack/kderc ]; then
|
||||
update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/powerpack/kderc
|
||||
fi
|
||||
|
||||
%description -n powerpack-kde3-config
|
||||
This package regroups all specific Mandriva config file for KDE.
|
||||
|
||||
%files -n powerpack-kde3-config
|
||||
%defattr(0644,root,root,755)
|
||||
%dir %_localstatedir/lib/mandriva/kde-profiles/powerpack
|
||||
%_localstatedir/lib/mandriva/kde-profiles/powerpack/*
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package -n one-kde3-config
|
||||
Summary: Mandriva KDE configuration
|
||||
Group: Graphical desktop/KDE3
|
||||
Provides: kde-config-file = %version-%release
|
||||
Requires: mandriva-theme
|
||||
Requires: desktop-common-data
|
||||
Requires(pre): mandriva-kde3-config-common = %version-%release
|
||||
Conflicts: kdelibs-common < %epoch_kdelibs:3.5.1
|
||||
Conflicts: kdebase-common < 1:3.5.2-10.1.20060mdk
|
||||
Obsoletes: mandriva-kde-config-file < 2008.0
|
||||
Provides: one-kde-config = %version-%release
|
||||
Obsoletes: one-kde-config
|
||||
Requires(preun): mandriva-kde3-config-common
|
||||
Obsoletes: one-kde3-config < %version-%release
|
||||
|
||||
%description -n one-kde3-config
|
||||
This package regroups all specific Mandriva config file for KDE.
|
||||
|
||||
%pre -n one-kde3-config
|
||||
if [ "$1" = "2" ]; then
|
||||
[ ! -h %_sysconfdir/kderc ] && rm -f %_sysconfdir/kderc ]
|
||||
fi
|
||||
if [ -d %_localstatedir/lib/mandriva/kde-profiles/one/share/apps/kdesktop/Desktop ]; then
|
||||
rm -rf %_localstatedir/lib/mandriva/kde-profiles/one/share/apps/kdesktop/Desktop
|
||||
fi
|
||||
|
||||
%post -n one-kde3-config
|
||||
update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/one/kderc 10
|
||||
|
||||
%postun -n one-kde3-config
|
||||
if ! [ -e /var/lib/mandriva/kde-profiles/one/kderc ]; then
|
||||
update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/one/kderc
|
||||
fi
|
||||
|
||||
%files -n one-kde3-config
|
||||
%defattr(0644,root,root,755)
|
||||
%dir %_localstatedir/lib/mandriva/kde-profiles/one
|
||||
%_localstatedir/lib/mandriva/kde-profiles/one/*
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package -n flash-kde3-config
|
||||
Summary: Mandriva KDE configuration
|
||||
Group: Graphical desktop/KDE3
|
||||
Provides: kde-config-file = %version-%release
|
||||
Requires: mandriva-theme
|
||||
Requires: desktop-common-data
|
||||
Requires(pre): mandriva-kde3-config-common = %version-%release
|
||||
Conflicts: kdelibs-common < %epoch_kdelibs:3.5.1
|
||||
Conflicts: kdebase-common < 1:3.5.2-10.1.20060mdk
|
||||
Obsoletes: mandriva-kde-config-file < 2008.0
|
||||
Provides: flash-kde-config = %version-%release
|
||||
Obsoletes: flash-kde-config
|
||||
Requires(preun): mandriva-kde3-config-common
|
||||
Obsoletes: flash-kde3-config < %version-%release
|
||||
|
||||
%description -n flash-kde3-config
|
||||
This package regroups all specific Mandriva config file for KDE.
|
||||
|
||||
%pre -n flash-kde3-config
|
||||
if [ "$1" = "2" ]; then
|
||||
[ ! -h %_sysconfdir/kderc ] && rm -f %_sysconfdir/kderc ]
|
||||
fi
|
||||
if [ -d %_localstatedir/lib/mandriva/kde-profiles/flash/share/apps/kdesktop/Desktop ]; then
|
||||
rm -rf %_localstatedir/lib/mandriva/kde-profiles/flash/share/apps/kdesktop/Desktop
|
||||
fi
|
||||
|
||||
%post -n flash-kde3-config
|
||||
update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/flash/kderc 10
|
||||
|
||||
%postun -n flash-kde3-config
|
||||
if ! [ -e /var/lib/mandriva/kde-profiles/flash/kderc ]; then
|
||||
update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/flash/kderc
|
||||
fi
|
||||
|
||||
%files -n flash-kde3-config
|
||||
%defattr(0644,root,root,755)
|
||||
%dir %_localstatedir/lib/mandriva/kde-profiles/flash
|
||||
%_localstatedir/lib/mandriva/kde-profiles/flash/*
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package -n free-kde3-config
|
||||
Summary: Mandriva KDE configuration
|
||||
Group: Graphical desktop/KDE3
|
||||
Provides: kde-config-file = %version-%release
|
||||
Requires: mandriva-theme
|
||||
Requires: qt4-style-iaora
|
||||
Requires: desktop-common-data
|
||||
Requires(pre): mandriva-kde3-config-common = %version-%release
|
||||
Conflicts: kdelibs-common < %epoch_kdelibs:3.5.1
|
||||
Conflicts: kdebase-common < 1:3.5.2-10.1.20060mdk
|
||||
Obsoletes: mandriva-kde-config-file < 2008.0
|
||||
Requires(preun): mandriva-kde3-config-common
|
||||
Obsoletes: download-kde-config-2007 < 2008.0
|
||||
Provides: download-kde-config-2007
|
||||
Obsoletes: discovery-kde-config < 2008.0
|
||||
Provides: discovery-kde-config = %version-%release
|
||||
Provides: free-kde-config = %version-%release
|
||||
Obsoletes: free-kde-config
|
||||
Obsoletes: free-kde3-config < %version-%release
|
||||
|
||||
%description -n free-kde3-config
|
||||
This package regroups all specific Mandriva config file for KDE.
|
||||
|
||||
%pre -n free-kde3-config
|
||||
if [ "$1" = "2" ]; then
|
||||
[ ! -h %_sysconfdir/kderc ] && rm -f %_sysconfdir/kderc ]
|
||||
fi
|
||||
if [ -d %_localstatedir/lib/mandriva/kde-profiles/free/share/apps/kdesktop/Desktop ]; then
|
||||
rm -rf %_localstatedir/lib/mandriva/kde-profiles/free/share/apps/kdesktop/Desktop
|
||||
fi
|
||||
|
||||
%post -n free-kde3-config
|
||||
update-alternatives --install /etc/kderc kde-config %_localstatedir/lib/mandriva/kde-profiles/free/kderc 10
|
||||
|
||||
%postun -n free-kde3-config
|
||||
if ! [ -e /var/lib/mandriva/kde-profiles/free/kderc ]; then
|
||||
update-alternatives --remove kde-config /var/lib/mandriva/kde-profiles/free/kderc
|
||||
fi
|
||||
|
||||
%files -n free-kde3-config
|
||||
%defattr(0644,root,root,755)
|
||||
%dir %_localstatedir/lib/mandriva/kde-profiles/free
|
||||
%_localstatedir/lib/mandriva/kde-profiles/free/*
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
# KDM
|
||||
|
||||
%package -n mandriva-kdm3-config
|
||||
Summary: Mandriva KDM config file
|
||||
Group: Graphical desktop/KDE3
|
||||
Obsoletes: kdebase-kdm-config-file < 2008.0
|
||||
Provides: kdm-config-file = %version-%release
|
||||
# For upgrade
|
||||
Provides: kdebase-kdm-config-file = 2:%version
|
||||
Conflicts: kdebase-progs <= 3.5.1-15.1.20060mdk
|
||||
Obsoletes: mandriva-kde-config-file < 2008.0
|
||||
Requires(post): perl-MDK-Common
|
||||
Obsoletes: mandriva-kdm-config
|
||||
Provides: mandriva-kdm-config = %version-%release
|
||||
|
||||
|
||||
%description -n mandriva-kdm3-config
|
||||
Mandriva KDM config file
|
||||
|
||||
%trigger -n mandriva-kdm3-config -- kdebase-kdm-config-file
|
||||
perl -MMDK::Common -e 'update_gnomekderc("%{_kde3_configdir}/kdm/kdmrc", "General", "ConsoleTTYs", "tty1,tty2,tty3,tty4,tty5,tty6", "ServerVTs", "-7")'
|
||||
|
||||
%files -n mandriva-kdm3-config
|
||||
%defattr(0644,root,root,0755)
|
||||
%config(noreplace) %_kde3_configdir/kdm/backgroundrc
|
||||
%config(noreplace) %_kde3_configdir/kdm/kdmrc
|
||||
%_kde3_configdir/kdm/themes
|
||||
|
||||
#---------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q -n %{oname}-%{version} -a 1 -a 2
|
||||
%patch0 -p1
|
||||
|
||||
%install
|
||||
rm -rf %buildroot
|
||||
# Create profile dirs
|
||||
mkdir -p %buildroot/%{_kde3_configdir}
|
||||
mkdir -p %buildroot/%_localstatedir/lib/mandriva
|
||||
|
||||
mv kde-profiles %buildroot/%_localstatedir/lib/mandriva
|
||||
mv kdm %buildroot/%{_kde3_configdir}
|
||||
|
||||
# openoffice icons, see #26311
|
||||
mkdir -p %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/icons/
|
||||
cp -a ooo-icons/hicolor %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/icons/
|
||||
|
||||
# openoffice mimetypes, see #26311
|
||||
mkdir -p %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/mimelnk/application
|
||||
cp -a opendocument-mime/* %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/mimelnk/application
|
||||
# XXX we have to rename them to the same name provided by kdelibs-common, otherwise the
|
||||
# global ones are used.
|
||||
pushd %buildroot/%_localstatedir/lib/mandriva/kde-profiles/common/share/mimelnk/application
|
||||
mv openoffice.org2.4-oasis-drawing.desktop vnd.oasis.opendocument.graphics.desktop
|
||||
mv openoffice.org2.4-oasis-drawing-template.desktop vnd.oasis.opendocument.graphics-template.desktop
|
||||
mv openoffice.org2.4-oasis-master-document.desktop vnd.oasis.opendocument.text-master.desktop
|
||||
mv openoffice.org2.4-oasis-formula.desktop vnd.oasis.opendocument.formula.desktop
|
||||
mv openoffice.org2.4-oasis-spreadsheet.desktop vnd.oasis.opendocument.spreadsheet.desktop
|
||||
mv openoffice.org2.4-oasis-spreadsheet-template.desktop vnd.oasis.opendocument.spreadsheet-template.desktop
|
||||
mv openoffice.org2.4-oasis-text.desktop vnd.oasis.opendocument.text.desktop
|
||||
mv openoffice.org2.4-oasis-text-template.desktop vnd.oasis.opendocument.text-template.desktop
|
||||
mv openoffice.org2.4-oasis-web-template.desktop vnd.oasis.opendocument.text-web.desktop
|
||||
mv openoffice.org2.4-oasis-presentation.desktop vnd.oasis.opendocument.presentation.desktop
|
||||
mv openoffice.org2.4-oasis-presentation-template.desktop vnd.oasis.opendocument.presentation-template.desktop
|
||||
mv openoffice.org2.4-spreadsheet.desktop vnd.sun.xml.calc.desktop
|
||||
mv openoffice.org2.4-spreadsheet-template.desktop vnd.sun.xml.calc.template.desktop
|
||||
mv openoffice.org2.4-presentation.desktop vnd.sun.xml.impress.desktop
|
||||
mv openoffice.org2.4-presentation-template.desktop vnd.sun.xml.impress.template.desktop
|
||||
mv openoffice.org2.4-drawing.desktop vnd.sun.xml.draw.desktop
|
||||
mv openoffice.org2.4-drawing-template.desktop vnd.sun.xml.draw.template.desktop
|
||||
mv openoffice.org2.4-text.desktop vnd.sun.xml.writer.desktop
|
||||
mv openoffice.org2.4-text-template.desktop vnd.sun.xml.writer.template.desktop
|
||||
mv openoffice.org2.4-master-document.desktop vnd.sun.xml.writer.master.desktop
|
||||
mv openoffice.org2.4-formula.desktop vnd.sun.xml.math.desktop
|
||||
popd
|
||||
|
||||
|
||||
for name in flash free one powerpack; do
|
||||
echo "[Directories-default]" > %buildroot%_localstatedir/lib/mandriva/kde-profiles/$name/kderc
|
||||
echo "prefixes=/var/lib/mandriva/kde-profiles/common,%_localstatedir/lib/mandriva/kde-profiles/$name" >> %buildroot%_localstatedir/lib/mandriva/kde-profiles/$name/kderc
|
||||
# create the symlink to the desktop data
|
||||
mkdir -p %buildroot%_localstatedir/lib/mandriva/kde-profiles/$name/share/apps/kdesktop
|
||||
ln -s %_datadir/mdk/desktop/$name %buildroot%_localstatedir/lib/mandriva/kde-profiles/$name/share/apps/kdesktop/DesktopLinks
|
||||
done
|
||||
|
||||
# Upstream
|
||||
echo "[Directories-default]" > %buildroot%_localstatedir/lib/mandriva/kde-profiles/common/upstream-kde-config
|
||||
echo "prefixes=%{_kde3_prefix}" >> %buildroot%_localstatedir/lib/mandriva/kde-profiles/common/upstream-kde-config
|
||||
|
||||
# Bookmarks
|
||||
mkdir -p %buildroot%_localstatedir/lib/mandriva/kde-profiles/{free,flash,one,powerpack}/share/apps/konqueror/
|
||||
ln -s %_datadir/mdk/bookmarks/konqueror/bookmarks-download.xml %buildroot%_localstatedir/lib/mandriva/kde-profiles/free/share/apps/konqueror/bookmarks.xml
|
||||
ln -s %_datadir/mdk/bookmarks/konqueror/bookmarks-one.xml %buildroot%_localstatedir/lib/mandriva/kde-profiles/one/share/apps/konqueror/bookmarks.xml
|
||||
ln -s %_datadir/mdk/bookmarks/konqueror/bookmarks-one.xml %buildroot%_localstatedir/lib/mandriva/kde-profiles/flash/share/apps/konqueror/bookmarks.xml
|
||||
ln -s %_datadir/mdk/bookmarks/konqueror/bookmarks-powerpack.xml %buildroot%_localstatedir/lib/mandriva/kde-profiles/powerpack/share/apps/konqueror/bookmarks.xml
|
||||
|
||||
%clean
|
||||
rm -rf %buildroot
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Feb 4 2011 Tim Williams <tim@my-place.org.uk> 2010.2-1mvt2010.2
|
||||
+ Rebuild for 2010.2
|
||||
|
||||
* Fri Jul 16 2010 Tim Williams <tim@my-place.org.uk> 2010.1-1mvt2010.1
|
||||
+ Rebuild for 2010.1
|
||||
|
||||
* Sun Feb 07 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2010.0-3mvt2010.0
|
||||
+ Prevent to install old 2009.0 packages
|
||||
+ Change mandriva-kdm-config package name to mandriva-kdm3-config to avoid possible future
|
||||
conflicts. (Mandriva developer may decide to change mandriva-kdm4-config to this one)
|
||||
|
||||
* Tue Jan 12 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2010.0-2mvt2010.0
|
||||
+ Fix ksplash and wallpaper issues
|
||||
|
||||
* Fri Jan 08 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2010.0-1mvt2010.0
|
||||
+ Rebuild source for 2010.0
|
||||
- Mandriva 2010.0 KDM theme added
|
||||
- Mandriva 2010.0 KSplash theme added
|
||||
|
||||
* Sun Nov 22 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2009.0-11mvt2010.0
|
||||
+ Fixed pacakge name to avoid old official Mandriva package upgrade
|
||||
|
||||
* Wed Nov 18 2009 Tim Williams <tim@my-place.org.uk> 2009.0-10mdv2010.0
|
||||
+ Add konq-home.patch. Changes default start page to avoid crash when viewing the default /usr/share/doc/HTML/index.html
|
||||
|
||||
* Tue Nov 17 2009 Tim Williams <tim@my-place.org.uk> 2009.0-9mdv2010.0
|
||||
+ Rebuild for MDV 2010.0
|
||||
|
||||
* Fri Sep 19 2008 Helio Chissini de Castro <helio@mandriva.com> 2009.0-8mdv2009.0
|
||||
+ Revision: 285971
|
||||
- Mandriva simple splash for kde3
|
||||
|
||||
* Tue Sep 16 2008 Helio Chissini de Castro <helio@mandriva.com> 2009.0-7mdv2009.0
|
||||
+ Revision: 285202
|
||||
- Update Mandriva Simple kde3 splash
|
||||
|
||||
* Mon Sep 01 2008 Helio Chissini de Castro <helio@mandriva.com> 2009.0-6mdv2009.0
|
||||
+ Revision: 278597
|
||||
- Fix profilerc due new .desktop files
|
||||
|
||||
* Thu Aug 07 2008 Helio Chissini de Castro <helio@mandriva.com> 2009.0-5mdv2009.0
|
||||
+ Revision: 265832
|
||||
- Start to disable basic services of kde3. kde4 runs kded daemon from kde3 to enable easy way to run kde3 applications. We don't want duplicate media notifiers, writed and other similar daemons.
|
||||
|
||||
* Mon Jul 28 2008 Anne Nicolas <anne.nicolas@mandriva.com> 2009.0-4mdv2009.0
|
||||
+ Revision: 251563
|
||||
- add qt4-style-iaora require
|
||||
|
||||
* Mon Jun 23 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2009.0-3mdv2009.0
|
||||
+ Revision: 228397
|
||||
- Changing X11* references in kdmrc to /usr/share/X11...
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- adapt to %%_localstatedir now being /var instead of /var/lib (#22312)
|
||||
|
||||
* Wed May 14 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2009.0-2mdv2009.0
|
||||
+ Revision: 207234
|
||||
- Update Flash design
|
||||
|
||||
* Tue May 06 2008 Helio Chissini de Castro <helio@mandriva.com> 2009.0-1mdv2009.0
|
||||
+ Revision: 201967
|
||||
- Fixed kdm position of new config file. Bye bye /etc/kde
|
||||
|
||||
* Wed Apr 02 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-27mdv2008.1
|
||||
+ Revision: 191678
|
||||
- Kmenu font size
|
||||
|
||||
* Tue Apr 01 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-26mdv2008.1
|
||||
+ Revision: 191389
|
||||
- I've commited this file with a wrong dir path. Fixed now...
|
||||
- Adding support to Mentor Office Keyboard again, with VolumeKeys disabled, because
|
||||
it's a kmilo function
|
||||
|
||||
* Fri Mar 28 2008 Ademar de Souza Reis Jr <ademar@mandriva.com.br> 2008.1-25mdv2008.1
|
||||
+ Revision: 190961
|
||||
- add openoffice icons and openoffice mimetypes so that
|
||||
opendocuments use the latest iconset from openoffice.org.
|
||||
Closes: #26311
|
||||
|
||||
* Thu Mar 27 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-24mdv2008.1
|
||||
+ Revision: 190675
|
||||
- Fixing Multimedia keyboard pb, by removing Mentor Office Wireless Keyboard shortcuts
|
||||
|
||||
* Fri Mar 14 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-23mdv2008.1
|
||||
+ Revision: 187866
|
||||
- Fix https://qa.mandriva.com/show_bug.cgi?id=37109
|
||||
- Line up icons by default on desktop
|
||||
|
||||
* Wed Mar 12 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-22mdv2008.1
|
||||
+ Revision: 187106
|
||||
- Fixing minipager issue, by adding a default config file acording to
|
||||
https://qa.mandriva.com/show_bug.cgi?id=37796
|
||||
|
||||
* Mon Mar 10 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-21mdv2008.1
|
||||
+ Revision: 183669
|
||||
- Fixing lockout-buttons in kicker to save their configurations affter logout.
|
||||
|
||||
* Fri Mar 07 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-20mdv2008.1
|
||||
+ Revision: 181604
|
||||
- Bookmarking made easy...
|
||||
|
||||
* Thu Mar 06 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-19mdv2008.1
|
||||
+ Revision: 181059
|
||||
- Use the right color scheme for KDM greeter
|
||||
- Add the config for the default wallpaper for 2008.1
|
||||
|
||||
* Wed Mar 05 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-18mdv2008.1
|
||||
+ Revision: 180241
|
||||
- Houston, we're out of space icons...
|
||||
|
||||
* Mon Mar 03 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-17mdv2008.1
|
||||
+ Revision: 177993
|
||||
- Updated with transparent buttons
|
||||
- Removed scaled allowing button getting good sizing and centerd position
|
||||
|
||||
* Fri Feb 29 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-16mdv2008.1
|
||||
+ Revision: 176912
|
||||
- Fix shutdown kfm image
|
||||
|
||||
* Fri Feb 29 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-15mdv2008.1
|
||||
+ Revision: 176750
|
||||
- Make sure the right colors are used
|
||||
|
||||
* Wed Feb 27 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-14mdv2008.1
|
||||
+ Revision: 175931
|
||||
- New release containing:
|
||||
* Fixed default colors for the kde profiles
|
||||
* Removed shadows from the status labels of splash themes
|
||||
* Updated kmenu icons
|
||||
* Updated metabar images
|
||||
|
||||
* Wed Feb 27 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-13mdv2008.1
|
||||
+ Revision: 175813
|
||||
- New release updating splash themes and color schemes for 2008.1
|
||||
|
||||
* Mon Feb 25 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-12mdv2008.1
|
||||
+ Revision: 175126
|
||||
- Proper faces dir for kdm
|
||||
|
||||
* Fri Feb 22 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-11mdv2008.1
|
||||
+ Revision: 173976
|
||||
- Add a simple splash screen for the ones who don't like the full screen splash
|
||||
|
||||
* Tue Feb 19 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-10mdv2008.1
|
||||
+ Revision: 173041
|
||||
- Fix the button background colors
|
||||
|
||||
* Fri Feb 15 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-9mdv2008.1
|
||||
+ Revision: 169003
|
||||
- Add a default configuration file to minipagerapplet
|
||||
|
||||
* Fri Feb 15 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-8mdv2008.1
|
||||
+ Revision: 168879
|
||||
- No use of external player as standard
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- fix summary-not-capitalized
|
||||
|
||||
* Fri Feb 01 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.1-7mdv2008.1
|
||||
+ Revision: 161221
|
||||
- Change the kside top images to match the new layout
|
||||
|
||||
* Wed Jan 09 2008 Helio Chissini de Castro <helio@mandriva.com> 2008.1-6mdv2008.1
|
||||
+ Revision: 147151
|
||||
- Make standard menu default again
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
* Fri Dec 21 2007 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 2008.1-5mdv2008.1
|
||||
+ Revision: 136414
|
||||
- Kicker's clockapplet was not saving their options
|
||||
when exits only one clock on kicker. Now its working.
|
||||
|
||||
* Tue Dec 18 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.1-4mdv2008.1
|
||||
+ Revision: 132432
|
||||
- Added media applet in kicker by default
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
- do not hardcode man pages extension
|
||||
|
||||
* Thu Dec 13 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.1-3mdv2008.1
|
||||
+ Revision: 119505
|
||||
- Fix upgrade from non alternatives /etc/kderc
|
||||
- Moved common kdeglobal settings for kdeglobals in common and removed the duplicated in the profiles
|
||||
- Set kspell default encoding for UTF8
|
||||
|
||||
* Thu Nov 22 2007 Thierry Vignaud <tvignaud@mandriva.com> 2008.1-2mdv2008.1
|
||||
+ Revision: 111300
|
||||
- reupload (missing on x86_64)
|
||||
|
||||
* Fri Oct 26 2007 Nicolas Lécureuil <neoclust@mandriva.org> 2008.1-1mdv2008.1
|
||||
+ Revision: 102378
|
||||
- Update tarball with merged patches
|
||||
|
||||
* Fri Oct 26 2007 Nicolas Lécureuil <neoclust@mandriva.org> 2008.0-31mdv2008.1
|
||||
+ Revision: 102229
|
||||
- Add patch to activate klipper
|
||||
|
||||
* Tue Oct 23 2007 Olivier Blin <oblin@mandriva.com> 2008.0-30mdv2008.1
|
||||
+ Revision: 101644
|
||||
- update Flash splash (from Helio)
|
||||
|
||||
* Thu Oct 18 2007 Olivier Blin <oblin@mandriva.com> 2008.0-29mdv2008.1
|
||||
+ Revision: 100018
|
||||
- add flash-kde-config
|
||||
|
||||
* Tue Oct 02 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-28mdv2008.0
|
||||
+ Revision: 94768
|
||||
- Make the Mandriva theme select the proper components (#33822)
|
||||
|
||||
* Mon Oct 01 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-27mdv2008.0
|
||||
+ Revision: 94151
|
||||
- Use the ia_ora style and colors in kdm
|
||||
|
||||
* Fri Sep 28 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-26mdv2008.0
|
||||
+ Revision: 93584
|
||||
- Restore kicker pager
|
||||
- Use official preview for moodin theme
|
||||
- Use sound notification only for session start and stop
|
||||
- Properly obsolete the discovery and powerpackplus kde config packages
|
||||
- Make all obsoletes tags versioned
|
||||
|
||||
* Wed Sep 26 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-24mdv2008.0
|
||||
+ Revision: 93095
|
||||
- Use DesktopLinks instead of Desktop to put icons on desktop (this way they get
|
||||
copied to the user home dir (#33204)
|
||||
|
||||
* Tue Sep 25 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-23mdv2008.0
|
||||
+ Revision: 92891
|
||||
- Enforce kaffeine as the default player for One and Free
|
||||
|
||||
+ Helio Chissini de Castro <helio@mandriva.com>
|
||||
- Flatten people image on powerpack images
|
||||
|
||||
* Fri Sep 21 2007 Anne Nicolas <anne.nicolas@mandriva.com> 2008.0-21mdv2008.0
|
||||
+ Revision: 91776
|
||||
- update sources
|
||||
- add metabar themes
|
||||
|
||||
* Wed Sep 19 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-20mdv2008.0
|
||||
+ Revision: 91199
|
||||
- Add squared icons for the K menu
|
||||
|
||||
* Wed Sep 19 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-19mdv2008.0
|
||||
+ Revision: 91017
|
||||
- Fix One color scheme
|
||||
|
||||
* Tue Sep 18 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-18mdv2008.0
|
||||
+ Revision: 89764
|
||||
- Define totem as the default player for powerpack
|
||||
|
||||
* Mon Sep 17 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 2008.0-17mdv2008.0
|
||||
+ Revision: 89272
|
||||
- Use the desktop icons from desktop-common-data so that they are proper
|
||||
translated
|
||||
|
||||
* Sat Sep 15 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-16mdv2008.0
|
||||
+ Revision: 85869
|
||||
- Multimedia direction change
|
||||
|
||||
* Sat Sep 15 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-15mdv2008.0
|
||||
+ Revision: 85852
|
||||
- Fix kickoff button
|
||||
|
||||
* Fri Sep 14 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-14mdv2008.0
|
||||
+ Revision: 85758
|
||||
- KDM changes
|
||||
- Sound changes
|
||||
|
||||
* Wed Sep 12 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-13mdv2008.0
|
||||
+ Revision: 84580
|
||||
- Fixed clock position
|
||||
- Fixed "fat" menu letters
|
||||
- Fixed spacing on itens
|
||||
|
||||
* Mon Sep 10 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-12mdv2008.0
|
||||
+ Revision: 84142
|
||||
- ksmserver image change
|
||||
- kdm call grub instead of lilo
|
||||
- Proper naming
|
||||
|
||||
* Thu Sep 06 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-11mdv2008.0
|
||||
+ Revision: 81020
|
||||
- Font and config
|
||||
- kdm, kicker and Free splash update
|
||||
|
||||
* Wed Sep 05 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-9mdv2008.0
|
||||
+ Revision: 80365
|
||||
- Position text
|
||||
- New kicker buttons
|
||||
- No kdm userlist
|
||||
- New ia_ora one scheme
|
||||
|
||||
* Tue Sep 04 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-8mdv2008.0
|
||||
+ Revision: 79481
|
||||
- Updated themes
|
||||
|
||||
* Tue Sep 04 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-7mdv2008.0
|
||||
+ Revision: 78913
|
||||
- Starting migrate kde theme for 2008.0
|
||||
|
||||
* Mon Aug 06 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-5mdv2008.0
|
||||
+ Revision: 59467
|
||||
- Restore original images lost on svn crash
|
||||
|
||||
* Thu Aug 02 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-4mdv2008.0
|
||||
+ Revision: 58316
|
||||
- Fixed splash, removing Galaxy at last !
|
||||
- Removed wallpaper patch, commited on svn
|
||||
- Fixed Discovery theme
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- [BUGFIX] change wallpaper link to more userfriendly one (bug #10638)'
|
||||
|
||||
* Fri Jun 08 2007 Anssi Hannula <anssi@mandriva.org> 2008.0-3mdv2008.0
|
||||
+ Revision: 37525
|
||||
- do not remove profile alternatives when upgrading package
|
||||
|
||||
* Fri Jun 08 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-2mdv2008.0
|
||||
+ Revision: 37505
|
||||
- Added possibility to change to upstream kde config, as requested by Anssi
|
||||
|
||||
* Mon Jun 04 2007 Helio Chissini de Castro <helio@mandriva.com> 2008.0-1mdv2008.0
|
||||
+ Revision: 35211
|
||||
- Removed old faulty updatekdeprofiles for a solution based on update-alternatives. Simple, using
|
||||
cascade for common avoiding symlinks, and letting have one profile read instead of a list of
|
||||
profiles that never keep same order
|
||||
- Added hardcoded files present before on kdebase package
|
||||
- Changed konsole config for Linux schema, instead of white one
|
||||
|
||||
|
||||
* Fri Apr 06 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-25mdv2007.1
|
||||
+ Revision: 150809
|
||||
- Fix nsplugins config
|
||||
|
||||
* Wed Mar 28 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-24mdv2007.1
|
||||
+ Revision: 149172
|
||||
- Fix kicker default icon
|
||||
|
||||
* Tue Mar 27 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-23mdv2007.1
|
||||
+ Revision: 149058
|
||||
- Fix kdesktop icon order
|
||||
|
||||
* Thu Mar 22 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-22mdv2007.1
|
||||
+ Revision: 148090
|
||||
- Fix windows key
|
||||
|
||||
* Wed Mar 21 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-21mdv2007.1
|
||||
+ Revision: 147454
|
||||
- Fix konsole default config
|
||||
|
||||
* Wed Mar 21 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-20mdv2007.1
|
||||
+ Revision: 147276
|
||||
- don't autostart klipper
|
||||
|
||||
* Mon Mar 19 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-19mdv2007.1
|
||||
+ Revision: 146426
|
||||
- Fix selected text color
|
||||
|
||||
* Thu Mar 15 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-18mdv2007.1
|
||||
+ Revision: 144247
|
||||
- Fix title text color
|
||||
|
||||
* Wed Mar 14 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-17mdv2007.1
|
||||
+ Revision: 143441
|
||||
- Fix kicker top
|
||||
Fix kdesktop icons order
|
||||
|
||||
* Mon Mar 12 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-16mdv2007.1
|
||||
+ Revision: 141633
|
||||
- Update kside top
|
||||
|
||||
* Sat Mar 10 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-15mdv2007.1
|
||||
+ Revision: 140413
|
||||
- Add jam search engine
|
||||
|
||||
* Wed Mar 07 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-14mdv2007.1
|
||||
+ Revision: 134313
|
||||
- Add specific desktop file
|
||||
|
||||
* Tue Mar 06 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-13mdv2007.1
|
||||
+ Revision: 134007
|
||||
- Fix free color
|
||||
|
||||
* Mon Mar 05 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-12mdv2007.1
|
||||
+ Revision: 133018
|
||||
- Minor fix
|
||||
|
||||
* Fri Mar 02 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-10mdv2007.1
|
||||
+ Revision: 130993
|
||||
- Update preview
|
||||
|
||||
* Thu Mar 01 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-9mdv2007.1
|
||||
+ Revision: 130605
|
||||
- Update moodin picture
|
||||
|
||||
* Tue Feb 27 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-8mdv2007.1
|
||||
+ Revision: 126305
|
||||
- Fix kicker config
|
||||
|
||||
* Fri Feb 16 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-7mdv2007.1
|
||||
+ Revision: 121648
|
||||
- Fix kicker config
|
||||
|
||||
* Fri Feb 16 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-6mdv2007.1
|
||||
+ Revision: 121631
|
||||
- New kside
|
||||
|
||||
* Fri Feb 16 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-5mdv2007.1
|
||||
+ Revision: 121620
|
||||
- Fix version
|
||||
- Add kicker 16x16 icons
|
||||
|
||||
* Wed Feb 14 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-4mdv2007.1
|
||||
+ Revision: 121083
|
||||
- Add kside
|
||||
|
||||
* Wed Feb 14 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-3mdv2007.1
|
||||
+ Revision: 121080
|
||||
- New update
|
||||
|
||||
* Wed Feb 14 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-2mdv2007.1
|
||||
+ Revision: 121001
|
||||
- Fix icons pos
|
||||
|
||||
* Wed Feb 14 2007 Laurent Montel <lmontel@mandriva.com> 2007.1-1mdv2007.1
|
||||
+ Revision: 120949
|
||||
- New version
|
||||
- New source
|
||||
|
||||
* Thu Nov 16 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-29mdv2007.1
|
||||
+ Revision: 85037
|
||||
- Touch default kdmrc to been able to provide userlist
|
||||
|
||||
+ Laurent Montel <lmontel@mandriva.com>
|
||||
- New package (2006-09-22 28mdv)
|
||||
Fix kmplayer backend
|
||||
- New package (2006-09-20 27mdv)
|
||||
Fix migrate kdm from 2006 (thanks Pixel)
|
||||
- New package (26mdv 2006-09-19)
|
||||
Only description into menu for one/discovery
|
||||
|
||||
* Tue Sep 19 2006 Laurent Montel <lmontel@mandriva.com> 2007-25mdv2007.0
|
||||
+ Revision: 61919
|
||||
- New package( 2006-09-18 25mdv)
|
||||
Fix wav encodage
|
||||
|
||||
* Sat Sep 16 2006 Laurent Montel <lmontel@mandriva.com> 2007-24mdv2007.0
|
||||
+ Revision: 61581
|
||||
- New sound
|
||||
|
||||
* Sat Sep 16 2006 Laurent Montel <lmontel@mandriva.com> 2007-23mdv2007.0
|
||||
+ Revision: 61570
|
||||
- New package (2006-09-15 23mdv)
|
||||
Add new mdk statup function
|
||||
|
||||
* Sat Sep 16 2006 Laurent Montel <lmontel@mandriva.com> 2007-22mdv2007.0
|
||||
+ Revision: 61542
|
||||
- New package (2006-09-15 22mdv)
|
||||
Add default sounds
|
||||
|
||||
* Fri Sep 15 2006 Laurent Montel <lmontel@mandriva.com> 2007-21mdv2007.0
|
||||
+ Revision: 61458
|
||||
- New package (2006-09-14 21mdv)
|
||||
Use double click
|
||||
|
||||
* Fri Sep 15 2006 Laurent Montel <lmontel@mandriva.com> 2007-20mdv2007.0
|
||||
+ Revision: 61419
|
||||
- New version
|
||||
Fix kicker right button
|
||||
|
||||
* Wed Sep 13 2006 Laurent Montel <lmontel@mandriva.com> 2007-19mdv2007.0
|
||||
+ Revision: 61072
|
||||
- New package (2006-09-12 19mdv)
|
||||
Rename download->free
|
||||
Fix typo
|
||||
- Add missing test
|
||||
|
||||
* Tue Sep 12 2006 Laurent Montel <lmontel@mandriva.com> 2007-18mdv2007.0
|
||||
+ Revision: 60840
|
||||
- New package (2006-09-11 18mdv)
|
||||
Workaround for Requires(preun) which doesn't work
|
||||
|
||||
* Tue Sep 12 2006 Laurent Montel <lmontel@mandriva.com> 2007-17mdv2007.0
|
||||
+ Revision: 60830
|
||||
- New package (2006-09-11 16mdv)
|
||||
Fix device on desktop
|
||||
|
||||
* Tue Sep 12 2006 Laurent Montel <lmontel@mandriva.com> 2007-16mdv2007.0
|
||||
+ Revision: 60764
|
||||
- New package (2006-09-11 16mdv)
|
||||
Fix default color, don't display tooltip by default
|
||||
|
||||
* Tue Sep 12 2006 Laurent Montel <lmontel@mandriva.com> 2007-15mdv2007.0
|
||||
+ Revision: 60757
|
||||
- New package (2006-09-11 15mdv)
|
||||
Fix kicker default apps
|
||||
|
||||
* Sat Sep 09 2006 Laurent Montel <lmontel@mandriva.com> 2007-14mdv2007.0
|
||||
+ Revision: 60598
|
||||
- New package (2006-09-08 14mdv)
|
||||
Use by default ia_ora-kde theme
|
||||
|
||||
* Thu Sep 07 2006 Laurent Montel <lmontel@mandriva.com> 2007-13mdv2007.0
|
||||
+ Revision: 60211
|
||||
- New package (2006/09/06 -13mdv)
|
||||
/var/lib/mandriva now is owned by this package
|
||||
Add requires postun (need to uninstall package)
|
||||
|
||||
* Wed Sep 06 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-12mdv2007.0
|
||||
+ Revision: 60141
|
||||
- Added new configuration for kscd
|
||||
|
||||
* Wed Sep 06 2006 Laurent Montel <lmontel@mandriva.com> 2007-11mdv2007.0
|
||||
+ Revision: 60084
|
||||
- New package (2006-09-05 2007-10mdv)
|
||||
Now each distro load correct scheme files
|
||||
- Fix typo
|
||||
|
||||
* Fri Sep 01 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-10mdv2007.0
|
||||
+ Revision: 59028
|
||||
- Xdmcp back to disabled due popular demand.
|
||||
- Fixed post update of profile ( Thanks to Nanar )
|
||||
|
||||
* Thu Aug 31 2006 Laurent Montel <lmontel@mandriva.com> 2007-9mdv2007.0
|
||||
+ Revision: 58847
|
||||
- Fix kside
|
||||
|
||||
+ Helio Chissini de Castro <helio@mandriva.com>
|
||||
- Fixed background defaults. Thanks to Laurent Montel
|
||||
- Moved configs for a non versionated directories. Requested by Pixel and Laurent
|
||||
- Fixed the clean generation if /etc/kderc.
|
||||
- Fixed kcookiejar config, which for some reason is making some people getting
|
||||
the cookies ask dialog back
|
||||
|
||||
* Tue Aug 29 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-7mdv2007.0
|
||||
+ Revision: 58364
|
||||
- Fix install for directories with space ( Galaxy )
|
||||
- Use the right tarball
|
||||
- Return to old Galaxy name for ksplash. Keep Mandriva2007 for "in the middel of
|
||||
cooker" upgrade
|
||||
- Fixed invalid resources
|
||||
- Set 2 desktops for discovery
|
||||
|
||||
* Fri Aug 25 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-6mdv2007.0
|
||||
+ Revision: 57975
|
||||
- Moved terminal from rxvt to xterm in failsafe session of kdm. rxvt not support
|
||||
utf-8 and most installations are using this by default
|
||||
- Fixed bug http://qa.mandriva.com/show_bug.cgi?id=24690 ( Wrong X path )
|
||||
- enabled xdmcp by default. System listen just locally.
|
||||
|
||||
* Fri Aug 25 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-5mdv2007.0
|
||||
+ Revision: 57956
|
||||
- Fixed type on ksplash theme rc
|
||||
- Fixed kdm postinstall
|
||||
|
||||
* Thu Aug 24 2006 Helio Chissini de Castro <helio@mandriva.com> 2007-4mdv2007.0
|
||||
+ Revision: 57753
|
||||
- Fixed updatekdeprofile by Nanar ( thanks )
|
||||
- Fixed config paths
|
||||
- Fixed upgrade of kdm config
|
||||
- Uploaded Mandriva configs for svn on soft
|
||||
- Added kside images ( depends on remove switch patch on kdebase )
|
||||
- Added new ksplash theme ( will have different color ones ones ? )
|
||||
- First fully operational package. Thanks to Nanar for all help
|
||||
- import mandriva-kde-config-2007-1mdv2007.0
|
||||
|
||||
+ Olivier Thauvin <nanardon@mandriva.org>
|
||||
- preserv order of value
|
||||
- the regexp need an eol marker
|
||||
- no space around the ,
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -1,33 +0,0 @@
|
||||
From 977d49018cebcc37d0b667713ad422f80ba9c8d2 Mon Sep 17 00:00:00 2001
|
||||
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
||||
Date: Fri, 16 Apr 2010 16:17:04 +0200
|
||||
Subject: [PATCH] Fix pinentry-gtk-2 SIGSEGV when unfocusing with -g argument
|
||||
|
||||
gdk_window_set_transient_for cannot be used with parent = NULL to
|
||||
unset transient hint (unlike gtk_ version which can). Replacement
|
||||
code is taken from gtk_window_transient_parent_unrealized
|
||||
|
||||
Applied cleanly at least over 0.8.0 and 0.7.6
|
||||
|
||||
More info see: https://bugzilla.redhat.com/show_bug.cgi?id=520236
|
||||
---
|
||||
gtk+-2/pinentry-gtk-2.c | 3 ++-
|
||||
1 files changed, 2 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/gtk+-2/pinentry-gtk-2.c b/gtk+-2/pinentry-gtk-2.c
|
||||
index 7cd7616..fdd5822 100644
|
||||
--- a/gtk+-2/pinentry-gtk-2.c
|
||||
+++ b/gtk+-2/pinentry-gtk-2.c
|
||||
@@ -145,7 +145,8 @@ ungrab_keyboard (GtkWidget *win, GdkEvent *event, gpointer data)
|
||||
{
|
||||
gdk_keyboard_ungrab (gdk_event_get_time (event));
|
||||
/* Unmake window transient for the root window. */
|
||||
- gdk_window_set_transient_for (win->window, NULL);
|
||||
+ gdk_property_delete (win->window,
|
||||
+ gdk_atom_intern_static_string ("WM_TRANSIENT_FOR"));
|
||||
}
|
||||
|
||||
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
Index: gtk+-2/pinentry-gtk-2.c
|
||||
===================================================================
|
||||
--- gtk+-2/pinentry-gtk-2.c (revision 228)
|
||||
+++ gtk+-2/pinentry-gtk-2.c (revision 229)
|
||||
@@ -52,6 +52,7 @@
|
||||
#endif
|
||||
|
||||
static pinentry_t pinentry;
|
||||
+static int grab_failed;
|
||||
static int passphrase_ok;
|
||||
typedef enum { CONFIRM_CANCEL, CONFIRM_OK, CONFIRM_NOTOK } confirm_value_t;
|
||||
static confirm_value_t confirm_value;
|
||||
@@ -135,7 +136,11 @@
|
||||
return;
|
||||
|
||||
if (gdk_keyboard_grab (win->window, FALSE, gdk_event_get_time (event)))
|
||||
- g_error ("could not grab keyboard");
|
||||
+ {
|
||||
+ g_critical ("could not grab keyboard");
|
||||
+ grab_failed = 1;
|
||||
+ gtk_main_quit ();
|
||||
+ }
|
||||
}
|
||||
|
||||
|
||||
@@ -520,7 +525,7 @@
|
||||
while (gtk_events_pending ())
|
||||
gtk_main_iteration ();
|
||||
|
||||
- if (confirm_value == CONFIRM_CANCEL)
|
||||
+ if (confirm_value == CONFIRM_CANCEL || grab_failed)
|
||||
pe->canceled = 1;
|
||||
|
||||
pinentry = NULL;
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
Index: gtk+-2/pinentry-gtk-2.c
|
||||
===================================================================
|
||||
--- gtk+-2/pinentry-gtk-2.c
|
||||
+++ gtk+-2/pinentry-gtk-2.c 2010-05-13 08:17:10.000000000 +0200
|
||||
@@ -306,8 +306,11 @@
|
||||
g_signal_connect (G_OBJECT (win),
|
||||
"realize", G_CALLBACK (make_transient), NULL);
|
||||
|
||||
+ //we need to grab the keyboard when its visible! not when its mapped (there is a difference)
|
||||
+ g_object_set(G_OBJECT(win), "events", GDK_VISIBILITY_NOTIFY_MASK | GDK_STRUCTURE_MASK, NULL);
|
||||
+
|
||||
g_signal_connect (G_OBJECT (win),
|
||||
- pinentry->grab ? "map-event" : "focus-in-event",
|
||||
+ pinentry->grab ? "visibility-notify-event" : "focus-in-event",
|
||||
G_CALLBACK (grab_keyboard), NULL);
|
||||
g_signal_connect (G_OBJECT (win),
|
||||
pinentry->grab ? "unmap-event" : "focus-out-event",
|
||||
@ -1,26 +0,0 @@
|
||||
From 0cc3dd71213687ccb5ec0a1866864558bf03260b Mon Sep 17 00:00:00 2001
|
||||
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
||||
Date: Fri, 7 May 2010 14:45:44 +0200
|
||||
Subject: [PATCH] Fix qt4 pinentry window created in the background
|
||||
|
||||
This is probably just a workaround. Proper fix is being investigated.
|
||||
---
|
||||
qt4/pinentrydialog.cpp | 1 -
|
||||
1 files changed, 0 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/qt4/pinentrydialog.cpp b/qt4/pinentrydialog.cpp
|
||||
index 8644136..6064ab9 100644
|
||||
--- a/qt4/pinentrydialog.cpp
|
||||
+++ b/qt4/pinentrydialog.cpp
|
||||
@@ -63,7 +63,6 @@ void raiseWindow( QWidget* w )
|
||||
SetForegroundWindowEx( w->winId() );
|
||||
#endif
|
||||
w->raise();
|
||||
- w->activateWindow();
|
||||
}
|
||||
|
||||
QPixmap icon( QStyle::StandardPixmap which )
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -1,70 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2009 Fedora Project
|
||||
# This file and all modifications and additions to the pristine
|
||||
# package are under the same license as the package itself.
|
||||
#
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
# Anna Bernathova <anicka@novell.com> 2006
|
||||
# Pavel Nemec <pnemec@novell.com> 2006
|
||||
# Rex Dieter <rdieter@fedoraproject.org> 2009
|
||||
#
|
||||
# use proper binary (pinentry-qt, pinentry-gtk-2 or pinentry-curses)
|
||||
|
||||
if [ -z "$PINENTRY_BINARY" ]; then
|
||||
|
||||
kde_running=
|
||||
if [ -n "$KDE_FULL_SESSION" ]; then
|
||||
kde_running=1
|
||||
elif [ -n "$DISPLAY" ]; then
|
||||
xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
|
||||
if test $? -eq 0; then
|
||||
kde_running=1
|
||||
fi
|
||||
else
|
||||
arg=
|
||||
display=
|
||||
for opt in "$@"; do
|
||||
if [ "$opt" = "--display" ]; then
|
||||
arg=1
|
||||
elif [ -n "$arg" ]; then
|
||||
display="$opt"
|
||||
else
|
||||
arg=
|
||||
fi
|
||||
done
|
||||
if [ -n "$display" ]; then
|
||||
DISPLAY="$display" xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
|
||||
if test $? -eq 0; then
|
||||
kde_running=1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# if KDE is detected and pinentry-qt exists, use pinentry-qt
|
||||
if [ -n "$kde_running" -a -x /usr/bin/pinentry-qt4 ]
|
||||
then
|
||||
export PINENTRY_BINARY="/usr/bin/pinentry-qt4"
|
||||
# otherwise test if pinentry-gtk-2 is installed
|
||||
elif [ -x /usr/bin/pinentry-gtk-2 ]
|
||||
then
|
||||
export PINENTRY_BINARY="/usr/bin/pinentry-gtk-2"
|
||||
# otherwise test if pinentry-qt4 is installed
|
||||
elif [ -x /usr/bin/pinentry-qt ]
|
||||
then
|
||||
export PINENTRY_BINARY="/usr/bin/pinentry-qt"
|
||||
# otherwise test if pinentry-qt exists although KDE is not detected
|
||||
elif [ -x /usr/bin/pinentry-qt4 ]
|
||||
then
|
||||
export PINENTRY_BINARY="/usr/bin/pinentry-qt4"
|
||||
# pinentry-curses is installed by default
|
||||
else
|
||||
export PINENTRY_BINARY="/usr/bin/pinentry-curses"
|
||||
|
||||
fi
|
||||
fi
|
||||
|
||||
exec $PINENTRY_BINARY "$@"
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
#!/bin/bash
|
||||
# This adds a USB device to the "desktop usb" group.
|
||||
# You just need to create an entry "desktopdev ..." in a usermap file
|
||||
# and it will be picked up automatically.
|
||||
|
||||
# Mandriva uses udev, you don't have to create a usermap
|
||||
# If you want this script to be called, you have to create an udev
|
||||
# rule in /etc/udev/rules.d/ that starts it, using
|
||||
# RUN+="/etc/udev/agents.d/usb/desktopdev"
|
||||
|
||||
if [ -x /sbin/resmgr ]; then
|
||||
if [ "${ACTION}" = "add" ]; then
|
||||
/sbin/resmgr ${ACTION} ${DEVICE} desktop usb && exit 0
|
||||
else
|
||||
/sbin/resmgr ${ACTION} ${DEVICE} desktop && exit 0
|
||||
fi
|
||||
fi
|
||||
@ -1,10 +0,0 @@
|
||||
--- resmgr-1.0/pam_resmgr.c 2003-03-05 14:32:19.000000000 +0100
|
||||
+++ resmgr-1.0.patched/pam_resmgr.c 2006-07-26 02:22:59.000000000 +0200
|
||||
@@ -9,6 +9,7 @@
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <ctype.h>
|
||||
+#include <syslog.h>
|
||||
|
||||
#include <security/pam_modules.h>
|
||||
#include "protocol.h"
|
||||
Binary file not shown.
@ -1,10 +0,0 @@
|
||||
--- class.c 2002-11-11 05:31:46.000000000 -0500
|
||||
+++ class.c.oden 2008-07-18 07:26:19.000000000 -0400
|
||||
@@ -11,6 +11,7 @@
|
||||
#include <unistd.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
+#include <limits.h>
|
||||
#include "resmgrd.h"
|
||||
|
||||
res_class_t * res_classes;
|
||||
@ -1,33 +0,0 @@
|
||||
--- Makefile 2003-04-10 10:21:01.000000000 +0200
|
||||
+++ Makefile.oden 2008-07-18 21:41:19.000000000 +0200
|
||||
@@ -23,6 +23,8 @@
|
||||
LIBBASE = libresmgr.so
|
||||
LIB = $(LIBBASE).$(VERSION)
|
||||
LIBOBJS = $(addprefix .lobjs/,conn.o client.o glob.o)
|
||||
+LDFLAGS =
|
||||
+PAMLIBS = -lpam
|
||||
|
||||
ALL = $(SRV) $(CLT) $(LIB) $(PAM) tester
|
||||
|
||||
@@ -46,17 +48,17 @@
|
||||
rm -rf $(ALL) $(LIBBASE) .objs .lobjs
|
||||
|
||||
$(SRV): $(SRVOBJS) $(LIB)
|
||||
- $(CC) -o $@ $(SRVOBJS) -L. -lresmgr
|
||||
+ $(CC) $(LDFLAGS) -o $@ $(SRVOBJS) -L. -lresmgr
|
||||
|
||||
$(CLT): $(CLTOBJS) $(LIB)
|
||||
- $(CC) -o $@ $(CLTOBJS) -L. -lresmgr
|
||||
+ $(CC) $(LDFLAGS) -o $@ $(CLTOBJS) -L. -lresmgr
|
||||
|
||||
$(LIB): $(LIBOBJS)
|
||||
- $(CC) -shared -Wl,-soname,$(notdir $(LIB)) -o $@ $(LIBOBJS)
|
||||
+ $(CC) -shared -Wl,-soname,$(notdir $(LIB)) $(LDFLAGS) -o $@ $(LIBOBJS)
|
||||
ln -sf $(LIB) $(LIBBASE)
|
||||
|
||||
$(PAM): $(PAMOBJS) $(LIB)
|
||||
- $(CC) -shared -o $@ $(PAMOBJS) -L. -lresmgr
|
||||
+ $(CC) -shared $(LDFLAGS) -o $@ $(PAMOBJS) $(PAMLIBS) -L. -lresmgr
|
||||
|
||||
tester: .objs/tester.o $(LIB)
|
||||
$(CC) -o $@ .objs/tester.o -L. -lresmgr
|
||||
@ -1,23 +0,0 @@
|
||||
--- Makefile 2008-07-18 21:48:27.000000000 +0200
|
||||
+++ Makefile.oden 2008-07-18 21:49:27.000000000 +0200
|
||||
@@ -33,15 +33,15 @@
|
||||
install: $(ALL)
|
||||
mkdir -p $(SBINDIR) $(LIBDIR) $(MANDIR)/man{1,3,5,8} \
|
||||
$(ETCDIR) $(PAMDIR) $(INCDIR)
|
||||
- install -m 555 $(LIB) $(LIBDIR)
|
||||
- install -m 555 $(PAM) $(PAMDIR)
|
||||
+ install -m 755 $(LIB) $(LIBDIR)
|
||||
+ install -m 755 $(PAM) $(PAMDIR)
|
||||
if [ ! -f $(ETCDIR)/resmgr.conf ]; then \
|
||||
install -m 644 etc/resmgr.conf $(ETCDIR); \
|
||||
fi
|
||||
- install -m 444 resmgr.h $(INCDIR)
|
||||
- install -m 555 -s $(CLT) $(SRV) $(SBINDIR)
|
||||
+ install -m 644 resmgr.h $(INCDIR)
|
||||
+ install -m 755 -s $(CLT) $(SRV) $(SBINDIR)
|
||||
for x in 1 3 5 8; do \
|
||||
- install -m 444 doc/*.$$x $(MANDIR)/man$$x; \
|
||||
+ install -m 644 doc/*.$$x $(MANDIR)/man$$x; \
|
||||
done
|
||||
|
||||
clean distclean:
|
||||
@ -1,12 +0,0 @@
|
||||
diff -ur resmgr-1.0.orig/utils.c resmgr-1.0/utils.c
|
||||
--- resmgr-1.0.orig/utils.c 2003-03-05 14:32:19.000000000 +0100
|
||||
+++ resmgr-1.0/utils.c 2005-03-16 11:47:58.000000000 +0100
|
||||
@@ -101,7 +101,7 @@
|
||||
sprintf(buffer, "%03d ", code);
|
||||
n = strlen(buffer);
|
||||
vsnprintf(buffer+n, sizeof(buffer)-n, fmt, ap);
|
||||
- vlog(LOG_INFO, "%s", buffer);
|
||||
+ def_log("%s", buffer);
|
||||
va_end(ap);
|
||||
}
|
||||
|
||||
@ -1,69 +0,0 @@
|
||||
# This is the default set of devices people logged in on the desktop get
|
||||
# access to:
|
||||
class desktop
|
||||
#
|
||||
# Standard multimedia devices
|
||||
add /dev/audio desktop
|
||||
add /dev/mixer desktop
|
||||
add /dev/dsp desktop
|
||||
add /dev/sequencer desktop
|
||||
add /dev/video desktop
|
||||
#
|
||||
# Modem device
|
||||
add /dev/modem desktop
|
||||
#
|
||||
# CD-ROMs - giving permission to open the corresponding SCSI
|
||||
# device is highly useful for CD writers such as cdrecord.
|
||||
add /dev/cdrom desktop scsi paride
|
||||
add /dev/cdrom1 desktop scsi paride
|
||||
add /dev/cdrecorder desktop scsi
|
||||
add /dev/dvd desktop scsi paride
|
||||
add /dev/dvd1 desktop scsi paride
|
||||
add /dev/sr0 desktop scsi
|
||||
add /dev/sr1 desktop scsi
|
||||
add /dev/sr2 desktop scsi
|
||||
add /dev/sr3 desktop scsi
|
||||
#
|
||||
# Dito for SCSI scanners, which all use /dev/scanner symlink.
|
||||
add /dev/scanner desktop scsi
|
||||
#
|
||||
# And USB scanners.
|
||||
add /dev/usbscanner desktop
|
||||
add /dev/usb/scanner desktop
|
||||
add /dev/usb/scanner0 desktop
|
||||
add /dev/usb/scanner1 desktop
|
||||
add /dev/usb/scanner2 desktop
|
||||
add /dev/usb/scanner3 desktop
|
||||
add /dev/usb/scanner4 desktop
|
||||
add /dev/usb/scanner5 desktop
|
||||
add /dev/usb/scanner6 desktop
|
||||
add /dev/usb/scanner7 desktop
|
||||
#
|
||||
# make /dev/console accessible read-only
|
||||
add /dev/console desktop read-only
|
||||
|
||||
#
|
||||
# This rule grants access to users logged in locally
|
||||
#
|
||||
allow desktop tty=/dev/tty[1-9]* || tty=tty[1-9]* || tty=:0
|
||||
|
||||
# For serial gphoto cameras.
|
||||
# add /dev/ttyS0 desktop
|
||||
# add /dev/ttyS1 desktop
|
||||
#
|
||||
# Sample rules, do not enable by default:
|
||||
#
|
||||
# This rule denies access to users uucp and news
|
||||
#
|
||||
# deny desktop user=uucp || user=news
|
||||
#
|
||||
# This rule gives access to all members of group wheel
|
||||
#
|
||||
# allow desktop group=wheel
|
||||
#
|
||||
# To make resmgr work with ssh, for instance, add the following
|
||||
# line to /etc/pam.d/ssh:
|
||||
# session optional pam_resmgr.so fake_ttyname
|
||||
# When a user logs in, a resmgr session will be opened, and
|
||||
# access will be granted automaticially to all resource classes
|
||||
# matched via access control statements in resmgr.conf.
|
||||
@ -1,56 +0,0 @@
|
||||
#!/bin/bash
|
||||
#
|
||||
# chkconfig: 2345 15 15
|
||||
# description: The resource manager is a framework to give user applications
|
||||
# access to certain device files. The resource manager daemon can be configured
|
||||
# to give certain users access to different resource classes.
|
||||
# processname: resmgr
|
||||
# pidfile: /var/run/resmgr.pid
|
||||
#
|
||||
### BEGIN INIT INFO
|
||||
# Provides: resmgr
|
||||
# Default-Start: 2 3 4 5
|
||||
# Short-Description: A program to allow arbitrary access to device files
|
||||
# Description: The resource manager is a framework to give user applications \
|
||||
# access to certain device files. The resource manager daemon can be configured \
|
||||
# to give certain users access to different resource classes.
|
||||
### END INIT INFO
|
||||
|
||||
# source function library
|
||||
. /etc/rc.d/init.d/functions
|
||||
|
||||
RETVAL=0
|
||||
|
||||
RESMGR_BIN=/sbin/resmgrd
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
gprintf "Starting resource manager services: "
|
||||
daemon $RESMGR_BIN
|
||||
RETVAL=$?
|
||||
echo
|
||||
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/resmgr
|
||||
;;
|
||||
stop)
|
||||
gprintf "Shutting down resmgr services: "
|
||||
killproc resmgr
|
||||
RETVAL=$?
|
||||
|
||||
echo
|
||||
[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/resmgr
|
||||
;;
|
||||
restart|reload)
|
||||
$0 stop
|
||||
$0 start
|
||||
RETVAL=$?
|
||||
;;
|
||||
status)
|
||||
status resmgr
|
||||
RETVAL=$?
|
||||
;;
|
||||
*)
|
||||
gprintf "Usage: resmgr {start|stop|status|restart|reload}\n"
|
||||
exit 1
|
||||
esac
|
||||
|
||||
exit $RETVAL
|
||||
@ -1,212 +0,0 @@
|
||||
%define major 1
|
||||
%define libname %mklibname %{name} %{major}
|
||||
%define develname %mklibname %{name} -d
|
||||
|
||||
Summary: A program to allow arbitrary access to device files
|
||||
Name: resmgr
|
||||
Version: 1.0
|
||||
Release: %mkrel 14
|
||||
License: GPLv2
|
||||
Group: System/Servers
|
||||
URL: http://www.lst.de/~okir/resmgr/
|
||||
Source: ftp://ftp.lst.de/pub/people/okir/%{name}/%{name}-%{version}.tar.bz2
|
||||
Source1: resmgr.init
|
||||
Source2: resmgr.conf
|
||||
Source3: desktopdev
|
||||
Patch0: resmgr-1.0-syslog.patch
|
||||
Patch1: resmgr-va_list.patch
|
||||
Patch2: resmgr-glibc28.diff
|
||||
Patch3: resmgr-linkage_fix.diff
|
||||
Patch4: resmgr-permission_fix.diff
|
||||
Requires(post): rpm-helper
|
||||
Requires(preun): rpm-helper
|
||||
BuildRequires: pam-devel
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
|
||||
%description
|
||||
The resource manager is a framework to give user applications access
|
||||
to certain device files. The resource manager daemon can be configured
|
||||
to give certain users access to different resource classes.
|
||||
|
||||
It supports hotplugging devices (i.e. new devices can be added to
|
||||
and removed from resource classes at run time), and it provides
|
||||
transparent access to the raw SCSI device corresponding to
|
||||
a CD writer or a scanner.
|
||||
|
||||
%package -n %{libname}
|
||||
Summary: Shared libraries for %{name}
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n %{libname}
|
||||
The resource manager is a framework to give user applications access
|
||||
to certain device files. The resource manager daemon can be configured
|
||||
to give certain users access to different resource classes.
|
||||
|
||||
It supports hotplugging devices (i.e. new devices can be added to
|
||||
and removed from resource classes at run time), and it provides
|
||||
transparent access to the raw SCSI device corresponding to
|
||||
a CD writer or a scanner.
|
||||
|
||||
%package -n %{develname}
|
||||
Summary: Development headers and libraries for %{name}
|
||||
Group: Development/C
|
||||
Requires: %{libname} = %{version}
|
||||
Provides: lib%{name}-devel = %{version}-%{release}
|
||||
Provides: %{name}-devel = %{version}-%{release}
|
||||
Obsoletes: %{mklibname resmgr 1 -d}
|
||||
|
||||
%description -n %{develname}
|
||||
The resource manager is a framework to give user applications access
|
||||
to certain device files. The resource manager daemon can be configured
|
||||
to give certain users access to different resource classes.
|
||||
|
||||
It supports hotplugging devices (i.e. new devices can be added to
|
||||
and removed from resource classes at run time), and it provides
|
||||
transparent access to the raw SCSI device corresponding to
|
||||
a CD writer or a scanner.
|
||||
|
||||
%prep
|
||||
|
||||
%setup -q
|
||||
%patch0 -p1 -b .syslog
|
||||
%patch1 -p1 -b .va_list
|
||||
%patch2 -p0 -b .glibc28
|
||||
%patch3 -p0 -b .linkage_fix
|
||||
%patch4 -p0 -b .permission_fix
|
||||
|
||||
%build
|
||||
%make CFLAGS="%{optflags} -D_GNU_SOURCE" LDFLAGS="%{ldflags}"
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%makeinstall_std LIBDIR=%{buildroot}/%{_lib} PAMDIR=%{buildroot}/%{_lib}/security
|
||||
|
||||
ln -sf libresmgr.so.* %{buildroot}/%{_lib}/libresmgr.so
|
||||
install -m755 %{SOURCE1} -D %{buildroot}%{_initrddir}/%{name}
|
||||
mkdir -p %{buildroot}/usr/sbin/
|
||||
ln -s ../..%{_initrddir}/%{name} %{buildroot}%{_sbindir}/rc%{name}
|
||||
# install config file
|
||||
install -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}.conf
|
||||
install -c -m755 %{SOURCE3} -D %{buildroot}%{_sysconfdir}/udev/agents.d/usb/desktopdev
|
||||
|
||||
%post
|
||||
%_post_service %{name}
|
||||
|
||||
%preun
|
||||
%_preun_service %{name}
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n %{libname} -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %{libname} -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc README TODO ANNOUNCE
|
||||
%config(noreplace) %{_sysconfdir}/%{name}.conf
|
||||
%{_initrddir}/%{name}
|
||||
%{_sysconfdir}/udev/agents.d/usb/desktopdev
|
||||
%{_sbindir}/rc%{name}
|
||||
/sbin/%{name}
|
||||
/sbin/%{name}d
|
||||
%{_mandir}/man*/*
|
||||
|
||||
%files -n %{libname}
|
||||
%defattr(-,root,root)
|
||||
/%{_lib}/*.so.*
|
||||
/%{_lib}/security/*
|
||||
|
||||
%files -n %{develname}
|
||||
%defattr(-,root,root)
|
||||
/%{_lib}/*.so
|
||||
%{_includedir}/%{name}.h
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jul 18 2011 Tim Williams <tim@my-place.org.uk> 1.0-14mdv2010.2
|
||||
+ Rebuild for Trinity
|
||||
|
||||
* Thu Sep 03 2009 Christophe Fergeau <cfergeau@mandriva.com> 1.0-13mdv2010.0
|
||||
+ Revision: 426907
|
||||
- rebuild
|
||||
|
||||
* Mon Dec 22 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0-12mdv2009.1
|
||||
+ Revision: 317576
|
||||
- use %%ldflags
|
||||
|
||||
* Fri Jul 18 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0-11mdv2009.0
|
||||
+ Revision: 238350
|
||||
- fix linkage
|
||||
- fix errors in the init script
|
||||
- fix permissions (for strip + debug packaging)
|
||||
|
||||
* Fri Jul 18 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0-10mdv2009.0
|
||||
+ Revision: 238102
|
||||
- added P1 from pld
|
||||
- fix build, P2 + -D_GNU_SOURCE
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- rebuild
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
|
||||
|
||||
* Wed Mar 05 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0-8mdv2008.1
|
||||
+ Revision: 179431
|
||||
- rebuild
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
|
||||
* Wed Aug 01 2007 Adam Williamson <awilliamson@mandriva.org> 1.0-7mdv2008.0
|
||||
+ Revision: 57363
|
||||
- rebuild for 2008
|
||||
- new devel policy
|
||||
- spec clean
|
||||
|
||||
|
||||
* Mon Jul 31 2006 Helio Chissini de Castro <helio@mandriva.com>
|
||||
+ 2006-07-31 20:51:47 (42877)
|
||||
- Increase release number
|
||||
|
||||
* Mon Jul 31 2006 Helio Chissini de Castro <helio@mandriva.com>
|
||||
+ 2006-07-31 20:50:48 (42876)
|
||||
- Fix for http://qa.mandriva.com/show_bug.cgi?id=23968 ( wrong init services )
|
||||
|
||||
* Wed Jul 26 2006 Helio Chissini de Castro <helio@mandriva.com>
|
||||
+ 2006-07-26 03:39:04 (42167)
|
||||
- Moved to subversion
|
||||
- Added patch from Jan Ciger to fix syslog defines
|
||||
|
||||
* Wed Jul 26 2006 Helio Chissini de Castro <helio@mandriva.com>
|
||||
+ 2006-07-26 03:11:36 (42165)
|
||||
- import resmgr-1.0-4mdk
|
||||
|
||||
* Wed Jan 18 2006 Olivier Blin <oblin@mandriva.com> 1.0-4mdk
|
||||
- fix pam files installation on x86_64
|
||||
- buildrequire pam-devel
|
||||
- drop hotplug requirement
|
||||
|
||||
* Sat Aug 27 2005 Olivier Blin <oblin@mandriva.com> 1.0-3mdk
|
||||
- move hotplug script to in udev agents.d directory
|
||||
- update Source4 to explain how it should be handled with udev
|
||||
|
||||
* Sun Jun 12 2005 Per Øyvind Karlsen <pkarlsen@mandriva.com> 1.0-2mdk
|
||||
- rebuild
|
||||
- fix requires
|
||||
- do not mark init file as config file
|
||||
- %%{1}mdv2007.0
|
||||
|
||||
* Fri May 21 2004 Per Øyvind Karlsen <peroyvind@linux-mandrake.com> 1.0-1mdk
|
||||
- initial mdk release (based on suse package)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,11 +0,0 @@
|
||||
--- messages/kdepim/kmail.po.orig 2008-03-07 10:09:18.000000000 +0200
|
||||
+++ messages/kdepim/kmail.po 2008-03-07 10:09:04.000000000 +0200
|
||||
@@ -5750,7 +5750,7 @@
|
||||
|
||||
#: kmfilteraction.cpp:1213
|
||||
msgid "Replace:"
|
||||
-msgstr "&Değiştir:"
|
||||
+msgstr "Değiştir:"
|
||||
|
||||
#: kmfilteraction.cpp:1220
|
||||
msgid "With:"
|
||||
@ -1,229 +0,0 @@
|
||||
%define oname kde-i18n-tr
|
||||
Name: kde3-i18n-tr
|
||||
Summary: Turkish language support for KDE
|
||||
Version: 3.5.10
|
||||
Release: %mkrel 6
|
||||
Group: System/Internationalization
|
||||
License: GPL
|
||||
URL: http://www.kde.org/
|
||||
Source0: ftp://ftp.kde.org/pub/kde/stable/%version/src/kde-i18n/%oname-%version.tar.bz2
|
||||
Patch0: filter-replace.patch
|
||||
Patch1: add-low-space-translations.patch
|
||||
Patch2: tr.patch
|
||||
Patch3: fix-kdeprint-typo.patch
|
||||
Patch4: fuzzy-clock.patch
|
||||
Patch5: kdepasswd.patch
|
||||
Patch6: khexeditor-fixes.diff
|
||||
Patch7: knode.patch
|
||||
Patch8: konqside_metabar.patch
|
||||
Patch9: konqueror_by_date.patch
|
||||
Patch10: konqueror_konq_view.patch
|
||||
Patch11: kopete-extra-strings.patch
|
||||
Patch12: useraccount-translation-fix.patch
|
||||
Patch13: kio_media.patch
|
||||
Patch14: kickoff.patch
|
||||
Patch15: add_new_features.patch
|
||||
BuildRoot: %_tmppath/%name-%version-%release-buildroot
|
||||
Requires: locales-tr
|
||||
BuildArch: noarch
|
||||
BuildRequires: freetype2
|
||||
BuildRequires: gettext
|
||||
BuildRequires: kdelibs-devel kde3-macros
|
||||
BuildRequires: texinfo
|
||||
Obsoletes: kde-i18n-tr3
|
||||
Obsoletes: %oname
|
||||
Provides: kde-i18n-tr3
|
||||
Provides: %oname
|
||||
Provides: kde-l10n = %version
|
||||
Suggests: zemberek-server
|
||||
Suggests: zpspell
|
||||
|
||||
%description
|
||||
Turkish language support for KDE.
|
||||
|
||||
%prep
|
||||
%setup -q -n %oname-%version
|
||||
%patch0 -p0
|
||||
%patch1 -p1
|
||||
%patch2 -p0
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p0
|
||||
%patch10 -p1
|
||||
%patch11 -p0
|
||||
%patch12 -p1
|
||||
%patch13
|
||||
%patch14 -p1
|
||||
%patch15 -p1
|
||||
|
||||
%build
|
||||
%configure_kde3
|
||||
|
||||
make clean
|
||||
%make
|
||||
|
||||
%install
|
||||
rm -fr %buildroot
|
||||
%makeinstall_std
|
||||
|
||||
%clean
|
||||
rm -fr %buildroot
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_datadir/locale/*/LC_MESSAGES/*
|
||||
%_kde3_datadir/locale/*/flag.png
|
||||
%_kde3_datadir/locale/*/charset
|
||||
%_kde3_datadir/locale/*/entry.desktop
|
||||
%_kde3_appsdir/*
|
||||
%doc %_kde3_docdir/HTML/*/*
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jul 18 2011 Tim Williams <tim@my-place.org.uk> 3.5.10-6mvt2010.2
|
||||
+ repackage for Trinity
|
||||
|
||||
* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 3.5.10-5mvt2010.0
|
||||
+ repackage for MDV 2010.1
|
||||
|
||||
* Tue Apr 20 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 3.5.10-4mvt2010.0
|
||||
+ Add new kickoff strings and Kcontrol session Managament module strings
|
||||
|
||||
* Wed Dec 23 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 3.5.10-3mvt2010.0
|
||||
+ Add kickoff translation patch and kio_media patch to improve Turkish translations
|
||||
|
||||
* Sun Nov 22 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 3.5.10-2mvt2010.0
|
||||
+ Rebuild for MDV 2010.0
|
||||
+ Add Pardus patches for better Turkish support
|
||||
+ Rename package to avoid possible KDE4 upgrades
|
||||
|
||||
* Fri Sep 05 2008 Funda Wang <fundawang@mandriva.org> 3.5.10-2mdv2009.0
|
||||
+ Revision: 281403
|
||||
- versioned provides
|
||||
|
||||
* Wed Sep 03 2008 Funda Wang <fundawang@mandriva.org> 3.5.10-1mdv2009.0
|
||||
+ Revision: 279500
|
||||
- New version 3.5.10
|
||||
|
||||
* Fri Aug 08 2008 Thierry Vignaud <tvignaud@mandriva.com> 3.5.9-6mdv2009.0
|
||||
+ Revision: 267457
|
||||
- rebuild early 2009.0 package (before pixel changes)
|
||||
|
||||
* Wed May 07 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-5mdv2009.0
|
||||
+ Revision: 203829
|
||||
- Move to /opt
|
||||
|
||||
* Sat Feb 16 2008 Olivier Blin <oblin@mandriva.com> 3.5.9-1mdv2008.1
|
||||
+ Revision: 169187
|
||||
- restore BuildRoot
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
|
||||
* Wed Oct 17 2007 Funda Wang <fundawang@mandriva.org> 3.5.8-1mdv2008.1
|
||||
+ Revision: 99648
|
||||
- New version 3.5.8
|
||||
|
||||
* Thu May 24 2007 Helio Chissini de Castro <helio@mandriva.com> 3.5.7-6mdv2008.0
|
||||
+ Revision: 30862
|
||||
- Fix locale requires. We use en, not en_GB
|
||||
|
||||
* Fri May 18 2007 Helio Chissini de Castro <helio@mandriva.com> 3.5.7-5mdv2008.0
|
||||
+ Revision: 27714
|
||||
- KDE i18n packages should not own whole i18n subsystem and kde apps data dirs. Thanks to Olivier Blin by report this one.
|
||||
|
||||
* Thu May 17 2007 Helio Chissini de Castro <helio@mandriva.com> 3.5.7-4mdv2008.0
|
||||
+ Revision: 27662
|
||||
- Fixed spec using sane file list and correct name from tarball
|
||||
- Update for forthcoming 3.5.7
|
||||
|
||||
|
||||
* Mon Feb 05 2007 Laurent Montel <lmontel@mandriva.com> 3.5.6-2mdv2007.0
|
||||
+ Revision: 116196
|
||||
- Fix spec file
|
||||
- 3.5.6
|
||||
|
||||
* Thu Nov 02 2006 Laurent Montel <lmontel@mandriva.com> 3.5.5-1mdv2007.1
|
||||
+ Revision: 75238
|
||||
- 3.5.5
|
||||
- Import kde-i18n-en_GB
|
||||
|
||||
* Fri Aug 04 2006 Laurent MONTEL <lmontel@mandriva.com> 3.5.4-1
|
||||
- 3.5.4
|
||||
|
||||
* Fri Jun 02 2006 Laurent MONTEL <lmontel@mandriva.com> 3.5.3-1
|
||||
- 3.5.3
|
||||
|
||||
* Sun May 28 2006 Laurent MONTEL <lmontel@mandriva.com> 3.5.2-3
|
||||
- Use %%mkrel
|
||||
|
||||
* Tue Apr 18 2006 Laurent MONTEL <lmontel@mandriva.com> 3.5.2-1mdk
|
||||
- 3.5.2
|
||||
|
||||
* Wed Feb 01 2006 Laurent MONTEL <lmontel@mandriva.com> 3.5.1-1mdk
|
||||
- 3.5.1
|
||||
|
||||
* Tue Nov 29 2005 Laurent MONTEL <lmontel@mandriva.com> 3.5.0-10mdk
|
||||
- Real kde-3.5.0
|
||||
|
||||
* Mon Nov 14 2005 Laurent MONTEL <lmontel@mandriva.com> 3.5.0-1mdk
|
||||
- 3.5.0 (named rc1)
|
||||
|
||||
* Tue Oct 18 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.4.92-1mdk
|
||||
- 3.5beta2
|
||||
|
||||
* Sat Jul 30 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.2-11mdk
|
||||
- Add virtual english package
|
||||
|
||||
* Fri Jul 29 2005 Laurent MONTEL <lmontel@mandriva.com> 10mdk
|
||||
- Fix provides kde-l10n
|
||||
|
||||
* Sat Jul 23 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.4.2-1mdk
|
||||
- 3.4.2
|
||||
|
||||
* Wed Jun 01 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.4.1-1mdk
|
||||
- 3.4.1
|
||||
|
||||
* Wed Mar 30 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.4.0-1mdk
|
||||
- 3.4.0
|
||||
|
||||
* Fri Feb 04 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-10mdk
|
||||
- Update from CVS and add kpdf translate from CVS
|
||||
|
||||
* Tue Nov 30 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-1mdk
|
||||
- 3.3.2
|
||||
|
||||
* Thu Oct 28 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-2mdk
|
||||
- Update from CVS
|
||||
|
||||
* Fri Sep 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-1mdk
|
||||
- KDE 3.3.0
|
||||
|
||||
* Fri Aug 13 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-2mdk
|
||||
- Sync with CVS
|
||||
|
||||
* Thu Jun 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-1mdk
|
||||
- 3.2.3
|
||||
|
||||
* Tue Apr 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-1mdk
|
||||
- 3.2.2
|
||||
|
||||
* Sun Apr 18 2004 Per Øyvind Karlsen <peroyvind@linux-mandrake.com> 3.2.1-2mdk
|
||||
- fix buildrequires
|
||||
- fix obsoletes-not-provided
|
||||
- rm -rf $RPM_BUILD_ROOT at the beginning of %%install
|
||||
- spec cosmetics
|
||||
|
||||
* Sat Apr 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.1-1mdk
|
||||
- 3.2.1
|
||||
|
||||
* Thu Mar 04 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.0-4mdk
|
||||
- Tarball was bad generated, it removed all kdevelop files
|
||||
|
||||
* Thu Feb 26 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.0-2mdk
|
||||
- Sync with CVS
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- messages/kdebase/kcmicons.po.orig 2008-11-10 10:48:40.000000000 +0200
|
||||
+++ messages/kdebase/kcmicons.po 2008-11-10 10:49:07.000000000 +0200
|
||||
@@ -119,7 +119,7 @@
|
||||
|
||||
#: icons.cpp:543
|
||||
msgid "To Monochrome"
|
||||
-msgstr "Tek Tenk"
|
||||
+msgstr "Tek Renk"
|
||||
|
||||
#: icons.cpp:549
|
||||
msgid "&Semi-transparent"
|
||||
@ -1,66 +0,0 @@
|
||||
2009-12-10 Stepan Kasal <skasal@redhat.com>
|
||||
|
||||
The change of implementation of AC_REQUIRE in 2.64 caused a regression
|
||||
in the arts project.
|
||||
This can be fixed by shuffling some macro calls.
|
||||
|
||||
I suppose that most of this patch will not be needed with a future
|
||||
release of Autoconf.
|
||||
But the last chunk of this patch is a real bug in this source and
|
||||
should go upstream.
|
||||
|
||||
--- arts-1.5.10/admin/acinclude.m4.in 2008-08-20 18:07:05.000000000 +0200
|
||||
+++ arts-1.5.10/admin/acinclude.m4.in 2009-12-09 17:30:57.000000000 +0100
|
||||
@@ -3081,8 +3081,18 @@
|
||||
fi
|
||||
])
|
||||
|
||||
+AC_DEFUN([AC_CHECK_COMPILERS_CC],
|
||||
+[
|
||||
+ dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
|
||||
+ CFLAGS=" $CFLAGS"
|
||||
+ AC_PROG_CC
|
||||
+ CXXFLAGS=" $CXXFLAGS"
|
||||
+ AC_PROG_CXX
|
||||
+])
|
||||
+
|
||||
AC_DEFUN([AC_CHECK_COMPILERS],
|
||||
[
|
||||
+ AC_REQUIRE([AC_CHECK_COMPILERS_CC])
|
||||
AC_ARG_ENABLE(debug,
|
||||
AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
|
||||
[
|
||||
@@ -3141,11 +3151,6 @@
|
||||
[kde_use_profiling="no"]
|
||||
)
|
||||
|
||||
- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
|
||||
- CFLAGS=" $CFLAGS"
|
||||
-
|
||||
- AC_PROG_CC
|
||||
-
|
||||
AC_PROG_CPP
|
||||
|
||||
if test "$GCC" = "yes"; then
|
||||
@@ -3174,10 +3179,6 @@
|
||||
LDFLAGS=""
|
||||
fi
|
||||
|
||||
- CXXFLAGS=" $CXXFLAGS"
|
||||
-
|
||||
- AC_PROG_CXX
|
||||
-
|
||||
KDE_CHECK_FOR_BAD_COMPILER
|
||||
|
||||
if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
|
||||
@@ -3503,8 +3504,8 @@
|
||||
AC_REQUIRE([AC_LIBTOOL_DLOPEN])
|
||||
AC_REQUIRE([KDE_CHECK_LIB64])
|
||||
|
||||
-AC_OBJEXT
|
||||
-AC_EXEEXT
|
||||
+AC_REQUIRE([AC_OBJEXT])
|
||||
+AC_REQUIRE([AC_EXEEXT])
|
||||
|
||||
AM_PROG_LIBTOOL
|
||||
AC_LIBTOOL_CXX
|
||||
@ -1,347 +0,0 @@
|
||||
%define lib_name_orig %mklibname kdeaccessibility
|
||||
%define lib_major 1
|
||||
%define lib_name %lib_name_orig%lib_major
|
||||
|
||||
%define lib_name_orig_kttsd %mklibname kttsd
|
||||
%define lib_major_kttsd 0
|
||||
%define lib_name_kttsd %lib_name_orig_kttsd%lib_major_kttsd
|
||||
|
||||
%define oname kdeaccessibility
|
||||
%define rname %{oname}3
|
||||
|
||||
Name: kde3-%{oname}
|
||||
Version: 3.5.12
|
||||
Release: %mkrel 1
|
||||
Epoch: 1
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: K Desktop Environment - Accessibility program
|
||||
URL: http://www.kde.org
|
||||
Source: ftp://ftp.kde.org/pub/kde/stable/%version/src/%oname-%version.tar.bz2
|
||||
Patch0: kde-3.5.10-acinclude.patch
|
||||
#Patch1: fix_autotools.patch
|
||||
Patch2: kdebase-3.5.12-move-xdg-menu-dir.patch
|
||||
Patch3: kdebase-3.5.12-config.patch
|
||||
|
||||
BuildRoot: %_tmppath/%name-%version-%release-root
|
||||
License: GPL
|
||||
BuildRequires: X11-devel
|
||||
BuildRequires: kdelibs3-devel
|
||||
BuildRequires: qt3-devel
|
||||
BuildRequires: kde3-macros
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
%endif
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
BuildRequires: automake > 1.5
|
||||
BuildRequires: akode-devel
|
||||
Conflicts: %oname < 1:3.5.10-2
|
||||
Conflicts: %rname < 1:3.5.10-3
|
||||
Provides: %oname = %epoch:%version-%release
|
||||
Provides: %rname = %epoch:%version-%release
|
||||
Obsoletes: %oname
|
||||
Obsoletes: %rname
|
||||
Obsoletes: kmag < %epoch:%version
|
||||
Provides: kde3-kmag = %epoch:%version-%release
|
||||
|
||||
%description
|
||||
KDE Accessibility Aids:
|
||||
- kmag, a screen magnifier,
|
||||
- kmousetool, a program for people whom it hurts to click the mouse
|
||||
- KMouth, a program that allows people who have lost their voice to let
|
||||
their computer speak for them.
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%_kde3_bindir/kmag
|
||||
%_kde3_bindir/kmousetool
|
||||
%_kde3_bindir/kmouth
|
||||
%_kde3_libdir/kde3/kbstate_*
|
||||
%dir %_kde3_appsdir/kbstateapplet/
|
||||
%_kde3_appsdir/kbstateapplet/*
|
||||
%_kde3_appsdir/kicker/applets/kbstateapplet.desktop
|
||||
%_kde3_datadir/applnk/Applications/kmag.desktop
|
||||
%_kde3_datadir/applnk/Applications/kmousetool.desktop
|
||||
%_kde3_datadir/applnk/Applications/kmouth.desktop
|
||||
%_kde3_datadir/applications/kde/kmag.desktop
|
||||
%_kde3_datadir/applications/kde/kmousetool.desktop
|
||||
%_kde3_datadir/applications/kde/kmouth.desktop
|
||||
%dir %_kde3_appsdir/kmag/
|
||||
%_kde3_appsdir/kmag/*
|
||||
%dir %_kde3_appsdir/kmousetool/
|
||||
%_kde3_appsdir/kmousetool/*
|
||||
%dir %_kde3_appsdir/kmouth/
|
||||
%_kde3_appsdir/kmouth/*
|
||||
|
||||
|
||||
%doc %_kde3_docdir/HTML/en/kmag
|
||||
%doc %_kde3_docdir/HTML/en/kmousetool
|
||||
%doc %_kde3_docdir/HTML/en/kmouth
|
||||
%_kde3_iconsdir/*/*/apps/*.png
|
||||
%dir %_kde3_datadir/icons/mono
|
||||
%_kde3_datadir/icons/mono/*
|
||||
|
||||
# To be moved for config package
|
||||
%_kde3_datadir/config/kmouthrc
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package kttsd
|
||||
Group: Development/KDE and Qt
|
||||
Summary: KDE Text-to-Speech
|
||||
Obsoletes: kttsd <= 0.3.0
|
||||
Provides: kttsd3 >= %epoch:3.4.0
|
||||
Provides: kde3-kttsd >= %epoch:3.4.0
|
||||
Requires: %{lib_name}-kttsd = %epoch:%version-%release
|
||||
Obsoletes: %oname-kttsd-gstreamer
|
||||
Provides: %oname-kttsd = %epoch:%version-%release
|
||||
Provides: %rname-kttsd = %epoch:%version-%release
|
||||
Obsoletes: %oname-kttsd
|
||||
Obsoletes: %rname-kttsd
|
||||
|
||||
%description kttsd
|
||||
KTTS -- KDE Text-to-Speech -- is a subsystem within the KDE desktop for
|
||||
conversion of text to audible speech. KTTS is currently under development
|
||||
and aims to become the standard subsystem for all KDE applications
|
||||
to provide speech output.
|
||||
User Features:
|
||||
_ Speak any text from the KDE clipboard.
|
||||
_ Speak any plain text file.
|
||||
_ Speak all or any portion of a text file from Kate.
|
||||
_ Speak all or any portion of an HTML page from Konqueror.
|
||||
_ Use as the speech backend for KMouth and KSayIt.
|
||||
_ Speak KDE notifications (KNotify).
|
||||
_ Long text is parsed into sentences. User may backup by sentence or
|
||||
paragraph, replay, pause, and stop playing.
|
||||
|
||||
%files kttsd
|
||||
%defattr(-,root,root,0755)
|
||||
%_kde3_bindir/ksayit
|
||||
%_kde3_bindir/kttsd
|
||||
%_kde3_bindir/kttsmgr
|
||||
%_kde3_datadir/applications/kde/ksayit.desktop
|
||||
%_kde3_datadir/services/ktexteditor_kttsd.desktop
|
||||
%_kde3_datadir/services/kttsjobmgr.desktop
|
||||
%_kde3_datadir/services/kttsd*
|
||||
%_kde3_datadir/servicetypes/*.desktop
|
||||
%_kde3_datadir/applications/kde/kcmkttsd.desktop
|
||||
%_kde3_datadir/applications/kde/kttsmgr.desktop
|
||||
%dir %_kde3_appsdir/ksayit
|
||||
%_kde3_appsdir/ksayit/*
|
||||
%dir %_kde3_appsdir/kttsd
|
||||
%_kde3_appsdir/kttsd/*
|
||||
%dir %_kde3_appsdir/ktexteditor_kttsd
|
||||
%_kde3_appsdir/ktexteditor_kttsd/*
|
||||
%_kde3_iconsdir/*/*/actions/*
|
||||
%doc %_kde3_docdir/HTML/en/kttsd
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package kttsd-akode
|
||||
Group: Development/KDE and Qt
|
||||
Summary: Akode plugins
|
||||
Requires: %name-kttsd >= %epoch:%version-%release
|
||||
Obsoletes: %{lib_name}-kttsd-akode
|
||||
Provides: %oname-kttsd-akode = %epoch:%version-%release
|
||||
Provides: %rname-kttsd-akode = %epoch:%version-%release
|
||||
Obsoletes: %oname-kttsd-akode
|
||||
Obsoletes: %rname-kttsd-akode
|
||||
|
||||
%description kttsd-akode
|
||||
Plugins for akode
|
||||
|
||||
%files kttsd-akode
|
||||
%defattr(-,root,root)
|
||||
%_kde3_datadir/services/*akodeplugin.desktop
|
||||
%_kde3_libdir/kde3/*akodeplugin.la
|
||||
%_kde3_libdir/kde3/*akodeplugin.so
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package -n %{lib_name}-kttsd
|
||||
Group: Development/KDE and Qt
|
||||
Summary: Library files for Kttsd
|
||||
Obsoletes: %{lib_name_kttsd} <= 0.3.0
|
||||
Provides: %{lib_name_kttsd} >= %epoch:3.4.0
|
||||
|
||||
|
||||
%description -n %{lib_name}-kttsd
|
||||
Libraries file for Ktts
|
||||
|
||||
%files -n %lib_name-kttsd
|
||||
%defattr(-,root,root)
|
||||
%_kde3_libdir/kde3/kcm_kttsd.*
|
||||
%_kde3_libdir/kde3/ktexteditor_kttsd.*
|
||||
%_kde3_libdir/kde3/libkttsd*
|
||||
%_kde3_libdir/kde3/libkttsjobmgrpart.*
|
||||
%_kde3_libdir/libkttsd.so.*
|
||||
%_kde3_libdir/libkttsd.la
|
||||
%_kde3_libdir/libKTTSD_Lib.so.*
|
||||
%_kde3_libdir/libKTTSD_Lib.la
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package -n %{lib_name}-kttsd-devel
|
||||
Group: Development/KDE and Qt
|
||||
Summary: Header files for developing ktts
|
||||
Requires: %{lib_name}-kttsd = %epoch:%{version}-%{release}
|
||||
Obsoletes: %{lib_name_kttsd}-devel <= 0.3.0
|
||||
Provides: %{lib_name_kttsd}-devel >= %epoch:3.4.0
|
||||
|
||||
%description -n %{lib_name}-kttsd-devel
|
||||
Header files needed for developing ktts applications.
|
||||
|
||||
%files -n %lib_name-kttsd-devel
|
||||
%defattr(-,root,root)
|
||||
%_kde3_includedir/*.h
|
||||
%_kde3_libdir/libkttsd.so
|
||||
%_kde3_libdir/libKTTSD_Lib.so
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q -n %oname-%version
|
||||
%if %mdkversion >= 201000
|
||||
%patch0 -p1
|
||||
#%patch1 -p1
|
||||
%endif
|
||||
%patch2 -p0
|
||||
%patch3 -p0
|
||||
|
||||
%build
|
||||
|
||||
export QTDIR=%_prefix/%_lib/qt3
|
||||
export KDEDIR=%_prefix
|
||||
|
||||
PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
|
||||
export xdg_menudir=%_sysconfdir/xdg/kde/menus
|
||||
|
||||
make -f admin/Makefile.common cvs
|
||||
|
||||
%configure_kde3 \
|
||||
--with-akode \
|
||||
--without-gstreamer \
|
||||
--disable-embedded \
|
||||
--disable-palmtop \
|
||||
--disable-kttsd-gstreamer \
|
||||
--with-xinerama
|
||||
|
||||
%make
|
||||
|
||||
%install
|
||||
rm -fr %buildroot
|
||||
export PATH=%_kde3_bindir:$PATH
|
||||
|
||||
make install DESTDIR=%buildroot
|
||||
|
||||
# Vfolder directory
|
||||
install -d %buildroot/%_kde3_datadir/applications/kde/
|
||||
cp %buildroot/%_kde3_datadir/applnk/Applications/kmag.desktop %buildroot/%_kde3_datadir/applications/kde/kmag.desktop
|
||||
cp %buildroot/%_kde3_datadir/applnk/Applications/kmousetool.desktop %buildroot/%_kde3_datadir/applications/kde/kmousetool.desktop
|
||||
cp %buildroot/%_kde3_datadir/applnk/Applications/kmouth.desktop %buildroot/%_kde3_datadir/applications/kde/kmouth.desktop
|
||||
|
||||
%clean
|
||||
rm -fr %buildroot
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 22 2011 Tim Williams <tim@my-place.org.uk> 1:3.5.12-1mdv2010.2
|
||||
- Update to Trinity 3.5.12 sources
|
||||
- Add xdg and build process patches
|
||||
|
||||
* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 1:3.5.10-5mdv2010.1
|
||||
- Rebuild for MDV 2010.1
|
||||
|
||||
* Sun Jan 17 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:3.5.10-4mvt2010.0
|
||||
+ KDE builds with autoconf 2.65, add patch for this and
|
||||
set autoconf to version 2.65:patch0
|
||||
+ Fix automake 1.11 issue:patch1
|
||||
+ Change package name to avoid KDE4 conflicts, add kde3 prefix
|
||||
+ Fix BuildRequirers, add kde3-macros
|
||||
|
||||
* Mon Nov 16 2009 Tim Williams <tim@my-place.org.uk> 1:3.5.10-3mdv2010.0
|
||||
- Rebuild for MDV 2010.0
|
||||
|
||||
* Mon Mar 23 2009 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.10-2mdv2009.1
|
||||
+ Revision: 360612
|
||||
- Change spec file name
|
||||
Fix spec file for new name
|
||||
Remove unused macros
|
||||
Add conflicts to ease upgrade to kde4
|
||||
|
||||
* Fri Aug 29 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.10-1mdv2009.0
|
||||
+ Revision: 277479
|
||||
- Update for last kde3 updates
|
||||
|
||||
* Wed Jun 25 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.9-5mdv2009.0
|
||||
+ Revision: 228960
|
||||
- Fix Provides
|
||||
|
||||
* Thu Jun 12 2008 Funda Wang <fundawang@mandriva.org> 1:3.5.9-4mdv2009.0
|
||||
+ Revision: 218493
|
||||
- rebuild for new ldflag
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
|
||||
- do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
|
||||
|
||||
* Sun Jun 01 2008 Funda Wang <fundawang@mandriva.org> 1:3.5.9-3mdv2009.0
|
||||
+ Revision: 213980
|
||||
- should provides kde3-kmag
|
||||
- do not obsoletes kmag 4
|
||||
|
||||
* Thu May 08 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.9-2mdv2009.0
|
||||
+ Revision: 204594
|
||||
- Fix macros
|
||||
- Move to /opt
|
||||
|
||||
* Fri Feb 15 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-1mdv2008.1
|
||||
+ Revision: 169026
|
||||
- Get away from branches. Last KDE 3 arriving !!
|
||||
- Removed post-3.5.8 patches integrated
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
+ Funda Wang <fundawang@mandriva.org>
|
||||
- fix duplicate mono dir
|
||||
|
||||
* Sat Dec 29 2007 Funda Wang <fundawang@mandriva.org> 1:3.5.8-3mdv2008.1
|
||||
+ Revision: 139064
|
||||
- rebuild
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
- fix summary
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- Add usptream 3.5.9 branch patches
|
||||
- Fix handling positions with Xinerama
|
||||
|
||||
* Wed Oct 24 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.8-1mdv2008.1
|
||||
+ Revision: 101691
|
||||
- Kde 3.5.8
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- fix summary-ended-with-dot
|
||||
|
||||
* Wed Sep 05 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-5mdv2008.0
|
||||
+ Revision: 80183
|
||||
- Disable old gstreamer
|
||||
|
||||
* Thu Aug 23 2007 Funda Wang <fundawang@mandriva.org> 1:3.5.7-4mdv2008.0
|
||||
+ Revision: 69377
|
||||
- fix kmag desktop file also
|
||||
|
||||
* Thu Aug 23 2007 Funda Wang <fundawang@mandriva.org> 1:3.5.7-3mdv2008.0
|
||||
+ Revision: 69365
|
||||
- fix invalid kmouth desktop file
|
||||
|
||||
* Fri Aug 10 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.7-2mdv2008.0
|
||||
+ Revision: 61653
|
||||
- Fix menu categories and OnlyShowIn ( Bug #32470)
|
||||
|
||||
* Thu May 17 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-1mdv2008.0
|
||||
+ Revision: 27530
|
||||
- 3.5.7 release
|
||||
|
||||
@ -1,870 +0,0 @@
|
||||
%define oldname kdeaddons
|
||||
%define lib_name_orig lib%oldname
|
||||
%define lib_major 1
|
||||
%define lib_name %mklibname %oldname %lib_major
|
||||
|
||||
Name: kde3-%{oldname}
|
||||
Summary: Kdeaddons
|
||||
Group: Graphical desktop/KDE3
|
||||
Version: 3.5.12
|
||||
Release: %mkrel 1
|
||||
Epoch: 1
|
||||
License: GPL
|
||||
URL: http://www.kde.org
|
||||
Source: http://download.kde.org/stable/3.5.10/src/%oldname-%version.tar.bz2
|
||||
Patch0: kdeaddons-3.2.3-call-drakclock.patch
|
||||
Patch1: kde-3.5.10-acinclude.patch
|
||||
#Patch2: fix_autotools.patch
|
||||
#Patch3: 01_searchbar-google-suggest.patch
|
||||
Patch4: kdebase-3.5.12-move-xdg-menu-dir.patch
|
||||
Patch5: kdebase-3.5.12-config.patch
|
||||
BuildRoot: %_tmppath/%name-%version-%release-root
|
||||
Provides: kdeaddons3 = %epoch:%version-%release
|
||||
Requires: %{name}-kfile-plugins = %epoch:%version-%release
|
||||
Requires: %{name}-kicker-applets = %epoch:%version-%release
|
||||
Requires: %{name}-konqimagegallery = %epoch:%version-%release
|
||||
Requires: %{name}-renamedlg = %epoch:%version-%release
|
||||
Requires: %{name}-konq-plugins = %epoch:%version-%release
|
||||
Requires: %{name}-kaddressbook-plugins = %epoch:%version-%release
|
||||
Requires: %{name}-knewsticker = %epoch:%version-%release
|
||||
Requires: ksig = %epoch:%version-%release
|
||||
Requires: %{name}-atlantik = %epoch:%version-%release
|
||||
Requires: %{name}-searchbar = %epoch:%version-%release
|
||||
Requires: %{name}-akregator = %epoch:%version-%release
|
||||
Requires: %{name}-metabar = %epoch:%version-%release
|
||||
Suggests: %{name}-kate = %epoch:%version-%release
|
||||
Obsoletes: %lib_name
|
||||
Obsoletes: %lib_name-devel
|
||||
Obsoletes: %{oldname}
|
||||
Provides: %{oldname} = %epoch:%version-%release
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
%endif
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
BuildRequires: automake > 1.5
|
||||
BuildRequires: X11-devel
|
||||
BuildRequires: freetype2-devel
|
||||
BuildRequires: libkde3base4-devel
|
||||
BuildRequires: libkde3-kdegames1-devel
|
||||
BuildRequires: libkdecore4-devel >= 3.2.12-1mvf
|
||||
BuildRequires: libSDL-devel
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: libaudiofile-devel
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: esound-devel
|
||||
BuildRequires: jpeg-devel
|
||||
BuildRequires: lcms-devel
|
||||
BuildRequires: mng-devel
|
||||
BuildRequires: png-devel
|
||||
BuildRequires: qt3-devel
|
||||
BuildRequires: kde3-kdepim-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: avahi-compat-libdns_sd-devel
|
||||
BuildRequires: mesaglu-devel
|
||||
BuildRequires: gpm-devel
|
||||
|
||||
%description
|
||||
Plugins for some KDE applications: kdeaddons extends the functionality
|
||||
of Konqueror, kate (text editor), kicker (some applets)
|
||||
and knewsticker.
|
||||
|
||||
%files
|
||||
|
||||
#-----------------------------------------------------------------------------------
|
||||
|
||||
%package kfile-plugins
|
||||
Summary: Kfile-plugins addons
|
||||
Group: Graphical desktop/KDE3
|
||||
Conflicts: kdeaddons < 1:3.5.7-4
|
||||
Obsoletes: kdeaddons-noatun
|
||||
Obsoletes: %{oldname}-kfile-plugins
|
||||
Provides: %{oldname}-kfile-plugins = %epoch:%version
|
||||
|
||||
%description kfile-plugins
|
||||
Kfile-plugins addons.
|
||||
|
||||
%files kfile-plugins
|
||||
%defattr(-,root,root)
|
||||
%_kde3_bindir/lnkforward
|
||||
%_kde3_libdir/kde3/kfile_*
|
||||
%_kde3_datadir/mimelnk/application/x-win-lnk.desktop
|
||||
%_kde3_datadir/applnk/.hidden/lnkforward.desktop
|
||||
%_kde3_datadir/services/kfile_*
|
||||
|
||||
#-----------------------------------------------------------------------------------
|
||||
|
||||
%package kicker-applets
|
||||
Summary: Kicker-applets addons
|
||||
Group: Graphical desktop/KDE3
|
||||
Requires: kdebase3-progs
|
||||
Conflicts: kdeaddons < 1:3.5.7-4
|
||||
Obsoletes: kdeaddons-noatun
|
||||
Obsoletes: %{oldname}-kicker-applets
|
||||
|
||||
%description kicker-applets
|
||||
Kicker-applets addons.
|
||||
|
||||
%files kicker-applets
|
||||
%defattr(-,root,root)
|
||||
%_kde3_appsdir/mediacontrol
|
||||
%_kde3_iconsdir/*/*/*/ktimemon.png
|
||||
%_kde3_appsdir/kicker
|
||||
%_kde3_datadir/config.kcfg/kbinaryclock.kcfg
|
||||
%_kde3_docdir/HTML/en/kicker-applets
|
||||
%_kde3_libdir/kde3/*_panelapplet.*
|
||||
|
||||
#-----------------------------------------------------------------------------------
|
||||
|
||||
%package konqimagegallery
|
||||
Summary: Konqimagegallery addon
|
||||
Group: Graphical desktop/KDE3
|
||||
Conflicts: kdeaddons < 1:3.5.7-4
|
||||
Obsoletes: kdeaddons-noatun
|
||||
Obsoletes: %{oldname}-konqimagegallery
|
||||
|
||||
|
||||
%description konqimagegallery
|
||||
Konqimagegallery addons.
|
||||
|
||||
%files konqimagegallery
|
||||
%defattr(-,root,root)
|
||||
%_kde3_iconsdir/*/*/*/imagegallery.png
|
||||
%_kde3_libdir/kde3/libkimgallery.*
|
||||
%_kde3_datadir/applnk/.hidden/kimgalleryplugin.desktop
|
||||
%_kde3_appsdir/konqiconview/kpartplugins/kimgalleryplugin.rc
|
||||
|
||||
#-----------------------------------------------------------------------------------
|
||||
|
||||
%package renamedlg
|
||||
Summary: Renamedlg addons
|
||||
Group: Graphical desktop/KDE3
|
||||
Conflicts: kdeaddons < 1:3.5.7-4
|
||||
Obsoletes: kdeaddons-noatun
|
||||
Obsoletes: %{oldname}-renamedlg
|
||||
Provides: %{oldname}-renamedlg = %epoch:%version
|
||||
|
||||
|
||||
%description renamedlg
|
||||
Plugins for the KDE file rename dialog.
|
||||
|
||||
%files renamedlg
|
||||
%defattr(-,root,root)
|
||||
%_kde3_libdir/kde3/librenaudioplugin.*
|
||||
%_kde3_libdir/kde3/librenimageplugin.*
|
||||
%_kde3_datadir/services/renaudiodlg.desktop
|
||||
%_kde3_datadir/services/renimagedlg.desktop
|
||||
|
||||
#-----------------------------------------------------------------------------------
|
||||
|
||||
%package konq-plugins
|
||||
Summary: Konq-plugins addons
|
||||
Group: Graphical desktop/KDE3
|
||||
Requires: kdebase3-progs
|
||||
Conflicts: kdeaddons < 1:3.5.7-4
|
||||
Obsoletes: kdeaddons-noatun
|
||||
Obsoletes: %{oldname}-konq-plugins
|
||||
Provides: %{oldname}-konq-plugins = %epoch:%version
|
||||
|
||||
|
||||
%description konq-plugins
|
||||
Konq-plugins addons.
|
||||
|
||||
%files konq-plugins
|
||||
%defattr(-,root,root)
|
||||
%_kde3_bindir/kio_media_realfolder
|
||||
%_kde3_bindir/fsview
|
||||
%_kde3_bindir/jpegorient
|
||||
%_kde3_libdir/kde3/libarkplugin.*
|
||||
%_kde3_libdir/kde3/kcm_kuick.*
|
||||
%_kde3_libdir/kde3/libkuickplugin.*
|
||||
%_kde3_libdir/kde3/libcrashesplugin.*
|
||||
%_kde3_libdir/kde3/webarchivethumbnail.*
|
||||
%_kde3_libdir/kde3/konq_sidebarnews.*
|
||||
%_kde3_libdir/kde3/libbabelfishplugin.*
|
||||
%_kde3_libdir/kde3/libkhtmlsettingsplugin.*
|
||||
%_kde3_libdir/kde3/libminitoolsplugin.*
|
||||
%_kde3_libdir/kde3/libfsviewpart.*
|
||||
%_kde3_libdir/kde3/libdomtreeviewerplugin.*
|
||||
%_kde3_libdir/kde3/konqsidebar_delicious.*
|
||||
%_kde3_libdir/kde3/librellinksplugin.*
|
||||
%_kde3_libdir/kde3/libdirfilterplugin.*
|
||||
%_kde3_libdir/kde3/libautorefresh.*
|
||||
%_kde3_libdir/kde3/libwebarchiverplugin.*
|
||||
%_kde3_libdir/kde3/libmfkonqmficon.*
|
||||
%_kde3_libdir/kde3/libvalidatorsplugin.*
|
||||
%_kde3_libdir/kde3/libuachangerplugin.*
|
||||
%_kde3_libdir/kde3/libadblock.*
|
||||
%_kde3_libdir/kde3/librsyncplugin.*
|
||||
%_kde3_appsdir/khtml
|
||||
%_kde3_appsdir/domtreeviewer
|
||||
%_kde3_appsdir/microformat
|
||||
%_kde3_appsdir/fsview
|
||||
%_kde3_appsdir/konqsidebartng
|
||||
%_kde3_appsdir/konqlistview
|
||||
%_kde3_appsdir/konqiconview
|
||||
%_kde3_appsdir/konqueror
|
||||
%_kde3_appsdir/imagerotation
|
||||
%_kde3_iconsdir/*/*/*/fsview.png
|
||||
%_kde3_iconsdir/*/*/*/konqside*
|
||||
%_kde3_iconsdir/*/*/*/autorefresh*
|
||||
%_kde3_iconsdir/*/*/*/htmlvalidator.png
|
||||
%_kde3_iconsdir/*/*/*/minitools.png
|
||||
%_kde3_iconsdir/*/*/*/webarchiver.png
|
||||
%_kde3_iconsdir/*/*/*/domtreeviewer.png
|
||||
%_kde3_iconsdir/*/*/*/cssvalidator.png
|
||||
%_kde3_iconsdir/*/*/*/babelfish.png
|
||||
%_kde3_iconsdir/*/*/*/validators.png
|
||||
%_kde3_datadir/applnk/.hidden/plugin_domtreeviewer.desktop
|
||||
%_kde3_datadir/applnk/.hidden/fsview.desktop
|
||||
%_kde3_datadir/applnk/.hidden/kcmkuick.desktop
|
||||
%_kde3_datadir/applnk/.hidden/khtmlsettingsplugin.desktop
|
||||
%_kde3_datadir/applnk/.hidden/plugin_babelfish.desktop
|
||||
%_kde3_datadir/applnk/.hidden/plugin_validators.desktop
|
||||
%_kde3_datadir/applnk/.hidden/kuickplugin.desktop
|
||||
%_kde3_datadir/applnk/.hidden/dirfilterplugin.desktop
|
||||
%_kde3_datadir/applnk/.hidden/uachangerplugin.desktop
|
||||
%_kde3_datadir/applnk/.hidden/crashesplugin.desktop
|
||||
%_kde3_datadir/applnk/.hidden/arkplugin.desktop
|
||||
%_kde3_datadir/applnk/.hidden/plugin_webarchiver.desktop
|
||||
%_kde3_datadir/applnk/.hidden/rsyncplugin.desktop
|
||||
%_kde3_datadir/config/translaterc
|
||||
%_kde3_datadir/config.kcfg/konq_sidebarnews.kcfg
|
||||
%_kde3_datadir/services/webarchivethumbnail.desktop
|
||||
%_kde3_datadir/services/ark_plugin.desktop
|
||||
%_kde3_datadir/services/fsview_part.desktop
|
||||
%_kde3_datadir/services/kuick_plugin.desktop
|
||||
%_kde3_datadir/icons/crystalsvg/16x16/actions/remotesync.png
|
||||
%_kde3_datadir/icons/crystalsvg/16x16/actions/remotesyncconfig.png
|
||||
%_kde3_datadir/icons/crystalsvg/22x22/actions/remotesync.png
|
||||
%_kde3_datadir/icons/crystalsvg/22x22/actions/remotesyncconfig.png
|
||||
%_kde3_docdir/HTML/en/konq-plugins
|
||||
%exclude %_kde3_appsdir/konqiconview/kpartplugins/kimgalleryplugin.rc
|
||||
%exclude %_kde3_appsdir/konqueror/kpartplugins/searchbar*
|
||||
%exclude %_kde3_appsdir/khtml/kpartplugins/akregator*
|
||||
%exclude %_kde3_appsdir/konqsidebartng/entries/metabar.desktop
|
||||
%exclude %_kde3_appsdir/konqsidebartng/add/metabar_add.desktop
|
||||
%exclude %_kde3_appsdir/konqueror/icons/crystalsvg/16x16/actions/google*
|
||||
|
||||
#-----------------------------------------------------------------------------------
|
||||
|
||||
%package kaddressbook-plugins
|
||||
Summary: Kaddressbook-plugins addons
|
||||
Group: Graphical desktop/KDE3
|
||||
Conflicts: kdeaddons < 1:3.5.7-4
|
||||
Obsoletes: kdeaddons-noatun
|
||||
Obsoletes: %{oldname}-kaddressbook-plugins
|
||||
Provides: %{oldname}-kaddressbook-plugins = %epoch:%version
|
||||
|
||||
|
||||
%description kaddressbook-plugins
|
||||
Kaddressbook-plugins addons.
|
||||
|
||||
%files kaddressbook-plugins
|
||||
%defattr(-,root,root)
|
||||
%_kde3_libdir/kde3/libkaddrbk_geo_xxport.*
|
||||
%_kde3_libdir/kde3/libkaddrbk_gmx_xxport.*
|
||||
%_kde3_appsdir/kaddressbook
|
||||
%_kde3_datadir/services/kaddressbook/gmx_xxport.desktop
|
||||
%_kde3_datadir/services/kaddressbook/geo_xxport.desktop
|
||||
|
||||
#-----------------------------------------------------------------------------------
|
||||
|
||||
%package knewsticker
|
||||
Summary: Knewsticker addons
|
||||
Group: Graphical desktop/KDE3
|
||||
Requires: kdenetwork3-knewsticker
|
||||
Conflicts: kdeaddons < 1:3.5.7-4
|
||||
Obsoletes: kdeaddons-noatun
|
||||
Obsoletes: %{oldname}-knewsticker
|
||||
Provides: %{oldname}-knewsticker = %epoch:%version
|
||||
|
||||
|
||||
%description knewsticker
|
||||
knewsticker addons
|
||||
|
||||
%files knewsticker
|
||||
%defattr(-,root,root)
|
||||
%_kde3_appsdir/knewsticker
|
||||
|
||||
#-----------------------------------------------------------------------------------
|
||||
|
||||
%package kate
|
||||
Summary: Kate addons
|
||||
Group: Graphical desktop/KDE3
|
||||
Requires: kdebase3-kate
|
||||
Conflicts: kdeaddons < 1:3.5.7-4
|
||||
Obsoletes: kdeaddons-noatun
|
||||
Obsoletes: %{oldname}-kate
|
||||
Provides: %{oldname}-kate = %epoch:%version
|
||||
|
||||
|
||||
%description kate
|
||||
Kate addons.
|
||||
|
||||
%files kate
|
||||
%defattr(-,root,root)
|
||||
%_kde3_libdir/kde3/kate*
|
||||
%_kde3_libdir/kde3/libkate*
|
||||
%_kde3_appsdir/kat*
|
||||
%_kde3_datadir/applnk/.hidden/kate*
|
||||
%_kde3_docdir/HTML/en/kate-plugins
|
||||
%_kde3_datadir/services/kate*
|
||||
|
||||
#-----------------------------------------------------------------------------------
|
||||
|
||||
%package -n kde3-ksig
|
||||
Summary: Signature generator
|
||||
Group: Graphical desktop/KDE3
|
||||
Conflicts: kdeaddons < 1:3.5.7-4
|
||||
Obsoletes: kdeaddons-noatun
|
||||
Obsoletes: ksig
|
||||
Provides: ksig = %epoch:%version
|
||||
|
||||
|
||||
%description -n kde3-ksig
|
||||
Signature generator.
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n kde3-ksig
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun -n kde3-ksig
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files -n kde3-ksig
|
||||
%defattr(-,root,root)
|
||||
%_kde3_iconsdir/*/*/*/ksig.png
|
||||
%_kde3_datadir/applications/kde/ksig.desktop
|
||||
%_kde3_appsdir/ksig
|
||||
%_kde3_bindir/ksig
|
||||
%_kde3_docdir/HTML/en/ksig
|
||||
|
||||
#-----------------------------------------------------------------------------------
|
||||
|
||||
%package atlantik
|
||||
Summary: Atlantik map generator
|
||||
Group: Graphical desktop/KDE3
|
||||
Requires: kdegames3
|
||||
Obsoletes: kdeaddons-noatun
|
||||
Obsoletes: %{oldname}-atlantik
|
||||
Provides: %{oldname}-atlantik = %epoch:%version
|
||||
|
||||
|
||||
%description atlantik
|
||||
Map generator for atlantik game
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post atlantik
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun atlantik
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files atlantik
|
||||
%defattr(-,root,root)
|
||||
%_kde3_bindir/atlantikdesigner
|
||||
%dir %_kde3_appsdir/atlantikdesigner/
|
||||
%_kde3_appsdir/atlantikdesigner/*
|
||||
%_kde3_datadir/applications/kde/atlantikdesigner.desktop
|
||||
%_kde3_iconsdir/*/*/*/atlantikdesigner.*
|
||||
|
||||
#-----------------------------------------------------------------------------------
|
||||
|
||||
%package searchbar
|
||||
Summary: Searchbar
|
||||
Group: Graphical desktop/KDE3
|
||||
Conflicts: kdeaddons < 1:3.5.5
|
||||
Conflicts: kdeaddons-konq-plugins < 1:3.5.7-8
|
||||
Obsoletes: kdeaddons-noatun
|
||||
Obsoletes: %{oldname}-searchbar
|
||||
Provides: %{oldname}-searchbar = %epoch:%version
|
||||
|
||||
|
||||
%description searchbar
|
||||
Search bar for konqueror
|
||||
|
||||
%files searchbar
|
||||
%defattr(-,root,root)
|
||||
%_kde3_libdir/kde3/libsearchbarplugin.*
|
||||
%_kde3_appsdir/konqueror/kpartplugins/searchbar*
|
||||
%_kde3_appsdir/konqueror/icons/crystalsvg/16x16/actions/google*
|
||||
|
||||
#-----------------------------------------------------------------------------------
|
||||
|
||||
%package akregator
|
||||
Summary: Akregator plugins
|
||||
Group: Graphical desktop/KDE3
|
||||
Requires: kde3-kdepim-akregator
|
||||
Conflicts: kdeaddons < 1:3.5.5
|
||||
Conflicts: kdeaddons-konq-plugins < 1:3.5.7-7
|
||||
Obsoletes: kdeaddons-noatun
|
||||
Obsoletes: %{oldname}-akregator
|
||||
Provides: %{oldname}-akregator = %epoch:%version
|
||||
|
||||
|
||||
%description akregator
|
||||
Akregator plugins.
|
||||
|
||||
%files akregator
|
||||
%defattr(-,root,root)
|
||||
%_kde3_libdir/kde3/libakregatorkonqfeedicon.*
|
||||
%_kde3_libdir/kde3/libakregatorkonqplugin.*
|
||||
%_kde3_appsdir/akregator/*
|
||||
%_kde3_appsdir/khtml/kpartplugins/akregator*
|
||||
%_kde3_datadir/services/akregator_konqplugin.desktop
|
||||
|
||||
#-----------------------------------------------------------------------------------
|
||||
|
||||
%package metabar
|
||||
Summary: A sidebar plugin for KDE's Konqueror
|
||||
Group: Graphical desktop/KDE3
|
||||
Requires: kdebase3-progs >= 3.2
|
||||
Conflicts: metabar <= 0.8-5mdk
|
||||
Conflicts: kdeaddons < 1:3.5.5
|
||||
Conflicts: kdeaddons-konq-plugins < 1:3.5.7-8
|
||||
Obsoletes: metabar <= 0.8-5mdk
|
||||
Provides: metabar = %version-%release
|
||||
Obsoletes: kdeaddons-noatun
|
||||
Obsoletes: %{oldname}-metabar
|
||||
Provides: %{oldname}-metabar = %epoch:%version
|
||||
|
||||
%description metabar
|
||||
A sidebar plugin for KDE's Konqueror which shows information and actions for
|
||||
selected files and directories.
|
||||
|
||||
%files metabar
|
||||
%defattr(-,root,root,-)
|
||||
%{_kde3_libdir}/kde3/konqsidebar_metabar.*
|
||||
%dir %{_kde3_appsdir}/metabar
|
||||
%{_kde3_appsdir}/metabar/*
|
||||
%_kde3_appsdir/konqsidebartng/entries/metabar.desktop
|
||||
%_kde3_iconsdir/*/*/*/metabar*
|
||||
%_kde3_appsdir/konqsidebartng/add/metabar_add.desktop
|
||||
|
||||
#-----------------------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
|
||||
%setup -q -n %{oldname}-%{version}
|
||||
%patch0 -p1 -b .fix_call_drakclock
|
||||
%if %mdkversion >= 201000
|
||||
%patch1 -p1
|
||||
#%patch2 -p1
|
||||
%endif
|
||||
#%patch3 -p1
|
||||
%patch4 -p0
|
||||
%patch5 -p0
|
||||
|
||||
%build
|
||||
export QTDIR=%qt3dir
|
||||
|
||||
export xdg_menudir=%_sysconfdir/xdg/kde/menus
|
||||
make -f admin/Makefile.common cvs
|
||||
|
||||
PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
|
||||
|
||||
%configure_kde3 \
|
||||
--without-arts
|
||||
|
||||
%make
|
||||
|
||||
|
||||
%install
|
||||
rm -fr %buildroot
|
||||
|
||||
%makeinstall_std
|
||||
|
||||
|
||||
%clean
|
||||
rm -fr %buildroot
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 1:3.5.12-1mvt2010.2
|
||||
+ Update to Trinity 3.5.12 sources
|
||||
- Remove fix-autotools.patch
|
||||
+ Add xdg dirs patch
|
||||
+ Add kdebase-3.5.12-config.patch
|
||||
+ Fix kdeaddons-3.2.3-call-drakclock.patch
|
||||
- Remove 01_searchbar-google-suggest.patch, no longer needed
|
||||
|
||||
* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 1:3.5.10-9mvt2010.0
|
||||
+ rebuild for MDV 2010.1
|
||||
|
||||
* Sun Jan 17 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:3.5.10-8mvt2010.0
|
||||
+ KDE builds with autoconf 2.65, add patch for this and
|
||||
set autoconf to version 2.65
|
||||
+ Add patch from Chakra Linux to provide google search suggestions
|
||||
on searchbar
|
||||
|
||||
* Fri Dec 08 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:3.5.10-7mvt2010.0
|
||||
+ New package name to avoid possible&unwanted KDE4 conflict
|
||||
+ Rename kdepim and kdepim-devel
|
||||
+ Fix automake 1.11 issue (still needed autoconf 2.63)
|
||||
|
||||
* Mon Nov 16 2009 Tim Williams <tim@my-place.org.uk> 1:3.5.10-6mdv2010.0
|
||||
+ kdepim3 dependency changed to kdepim for akregator
|
||||
|
||||
* Mon Nov 16 2009 Tim Williams <tim@my-place.org.uk> 1:3.5.10-5mdv2010.0
|
||||
+ Rebuild for MDV 2010.0
|
||||
+ kdepim3-devel changed to kdepim-devel
|
||||
|
||||
* Fri Apr 03 2009 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.10-4mdv2009.1
|
||||
+ Revision: 363639
|
||||
- New requires
|
||||
|
||||
* Tue Mar 31 2009 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.10-3mdv2009.1
|
||||
+ Revision: 363014
|
||||
- Fix references to kdepim
|
||||
|
||||
* Sun Mar 22 2009 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.10-2mdv2009.1
|
||||
+ Revision: 360344
|
||||
- Fix Requires
|
||||
|
||||
* Tue Oct 14 2008 Funda Wang <fundawang@mandriva.org> 1:3.5.10-1mdv2009.1
|
||||
+ Revision: 293490
|
||||
- New version 3.5.10
|
||||
|
||||
* Fri Aug 08 2008 Thierry Vignaud <tvignaud@mandriva.com> 1:3.5.9-4mdv2009.0
|
||||
+ Revision: 267766
|
||||
- rebuild early 2009.0 package (before pixel changes)
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
|
||||
|
||||
* Wed Jun 11 2008 Funda Wang <fundawang@mandriva.org> 1:3.5.9-3mdv2009.0
|
||||
+ Revision: 218110
|
||||
- bump release for rebuild for new ldflags
|
||||
- fix br
|
||||
|
||||
* Thu May 08 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-2mdv2009.0
|
||||
+ Revision: 204687
|
||||
- Move to /opt and kill uselless and problematic noatun plugins
|
||||
|
||||
* Sat Feb 16 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-1mdv2008.1
|
||||
+ Revision: 169177
|
||||
- Get away from branches. Last KDE 3 arriving !!
|
||||
- Removed post-3.5.8 patches integrated
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- fix summary-not-capitalized
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
* Mon Dec 31 2007 Oden Eriksson <oeriksson@mandriva.com> 1:3.5.8-3mdv2008.1
|
||||
+ Revision: 139860
|
||||
- rebuilt against openldap-2.4.7 libs
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- Add usptream 3.5.9 branch patches
|
||||
- Fix compilation with gcc 4.3
|
||||
|
||||
* Wed Oct 24 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.8-1mdv2008.1
|
||||
+ Revision: 101692
|
||||
- Kde 3.5.8
|
||||
|
||||
* Wed Oct 03 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1:3.5.7-12mdv2008.0
|
||||
+ Revision: 94970
|
||||
- Suggests kdeaddons-kate and kdeaddons-noatun (thanks Anssi for pointing that)
|
||||
|
||||
* Wed Oct 03 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1:3.5.7-11mdv2008.0
|
||||
+ Revision: 94869
|
||||
- Do not require kdeaddons-kate by default
|
||||
|
||||
* Sun Sep 30 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1:3.5.7-9mdv2008.0
|
||||
+ Revision: 94046
|
||||
- Do not require kdeaddons-noatun by default
|
||||
|
||||
* Sat Aug 18 2007 Anssi Hannula <anssi@mandriva.org> 1:3.5.7-8mdv2008.0
|
||||
+ Revision: 65551
|
||||
- fix file conflicts between kdeaddons-konq-plugins and
|
||||
kdeaddons-searchbar
|
||||
kdeaddons-metabar
|
||||
- add conflicts on old kdeaddons-konq-plugins to kdeaddons-akregator
|
||||
to ensure smooth upgrade
|
||||
|
||||
* Thu Aug 16 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-7mdv2008.0
|
||||
+ Revision: 64329
|
||||
- Remove conflicts
|
||||
|
||||
* Mon Aug 13 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-6mdv2008.0
|
||||
+ Revision: 62678
|
||||
- Fix conflicts.
|
||||
|
||||
* Wed Jun 20 2007 Anssi Hannula <anssi@mandriva.org> 1:3.5.7-5mdv2008.0
|
||||
+ Revision: 41876
|
||||
- fix conflicts
|
||||
|
||||
* Sat Jun 09 2007 Anssi Hannula <anssi@mandriva.org> 1:3.5.7-4mdv2008.0
|
||||
+ Revision: 37719
|
||||
- provide a kdeaddons metapackage which requires all subpackages
|
||||
- drop duplicate searchbar.desktop from main package
|
||||
|
||||
+ Helio Chissini de Castro <helio@mandriva.com>
|
||||
- Split split split .... Closing bug #17000
|
||||
|
||||
* Sat May 26 2007 Funda Wang <fundawang@mandriva.org> 1:3.5.7-2mdv2008.0
|
||||
+ Revision: 31402
|
||||
- Rebuild for directfb 1.0
|
||||
|
||||
+ Helio Chissini de Castro <helio@mandriva.com>
|
||||
- Update kdeaddons for 3.5.7
|
||||
|
||||
|
||||
* Fri Mar 02 2007 Laurent Montel <lmontel@mandriva.com> 3.5.6-3mdv2007.0
|
||||
+ Revision: 131499
|
||||
- Fix conflicts
|
||||
|
||||
* Fri Mar 02 2007 Laurent Montel <lmontel@mandriva.com> 1:3.5.6-2mdv2007.1
|
||||
+ Revision: 131103
|
||||
- Rebuild
|
||||
- 3.5.6
|
||||
- Fix spec file
|
||||
- Fix konq quick browser icon
|
||||
|
||||
* Thu Oct 26 2006 Laurent Montel <lmontel@mandriva.com> 1:3.5.5-3mdv2007.1
|
||||
+ Revision: 72719
|
||||
- Increase release
|
||||
- Fix conflict
|
||||
- Fix epoch
|
||||
|
||||
* Wed Oct 25 2006 Laurent Montel <lmontel@mandriva.com> 1:3.5.5-2mdv2007.1
|
||||
+ Revision: 72320
|
||||
- Install akregator files into kdeaddons-akregator
|
||||
=> fix display akregator into konqueror
|
||||
- 3.5.5
|
||||
- Fix metabar
|
||||
|
||||
* Thu Sep 07 2006 Laurent Montel <lmontel@mandriva.com> 1:3.5.4-3mdv2007.0
|
||||
+ Revision: 60239
|
||||
- New package (3.5.4-mdv 2006-09-06)
|
||||
Obsolete devel package too
|
||||
|
||||
* Wed Aug 09 2006 Laurent Montel <lmontel@mandriva.com> 1:3.5.4-2mdv2007.0
|
||||
+ Revision: 54423
|
||||
- Fix conflict
|
||||
- New package (2006/08/04 3.5.4-1mdv)
|
||||
|
||||
+ Helio Chissini de Castro <helio@mandriva.com>
|
||||
- Updated for latest official kde 3.5.4 release
|
||||
|
||||
* Mon Jul 24 2006 Laurent Montel <lmontel@mandriva.com> 1:3.5.3-7mdv2007.0
|
||||
+ Revision: 41935
|
||||
- Remove debug
|
||||
- Don't requires kdebase metapackage but kdebase-progs (need by kdeaddons)
|
||||
- 3.5.3
|
||||
- Rebuild against new xorg
|
||||
- Rebuild to generate category
|
||||
- Fix file list
|
||||
- 3.5.2
|
||||
- Fix conflict with metabar (Patch from neoclust)
|
||||
- Fix buildrequires
|
||||
- 3.5.1
|
||||
- Fix enable debug for cooker
|
||||
MDK9.2 is obsolete now
|
||||
- Add patch (and improve) from Neoclust to split metabar plugins
|
||||
Sync with kde3.5 branch
|
||||
- Add patch (and improve) from Neoclust to split metabar plugins
|
||||
- real kde3.5
|
||||
- 3.5.0
|
||||
- Rebuild for missing package
|
||||
- Fix typo
|
||||
* Wed Nov 02 2005 Laurent MONTEL <lmontel@mandriva.com> 3.3.5-3mdk
|
||||
- Rebuild with new mysql
|
||||
* Thu Oct 27 2005 Helio Chissini de Castro <helio@mandriva.com> 3.3.5-2mdk
|
||||
- New immodule patch
|
||||
- Obsolete metabar
|
||||
- 3.4.92
|
||||
- Fix package
|
||||
- Rebuild
|
||||
- Fix akregator bug
|
||||
- Fix rebuild
|
||||
- Rebuild
|
||||
- Fix conflict
|
||||
- Rebuild
|
||||
- Fix conflict (update from MDK10.1)
|
||||
- Update from svn
|
||||
- New release for missing package
|
||||
- 3.4.2
|
||||
|
||||
+ Helio Chissini de Castro <helio@mandriva.com>
|
||||
- Fix search plugin. Invalid file list
|
||||
- Added tarball from kde branch as discussed on meeting in 28/06
|
||||
- Removed rpath and added configure macro invalidating libtoolize
|
||||
- Cleanup to get rid of all library packages ( no libraries at all, just modules )
|
||||
- We are Mandriva now
|
||||
- Uploading package ./kdeaddons
|
||||
|
||||
+ Andreas Hasenack <andreas@mandriva.com>
|
||||
- renamed mdv to packages because mdv is too generic and it's hosting only packages anyway
|
||||
|
||||
* Tue May 17 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-6mdk
|
||||
- Fix MDK bug #15477
|
||||
|
||||
* Tue May 03 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-5mdk
|
||||
- Add missing build requires found by Christiaan Welvaart <cjw@daneel.dyndns.org>
|
||||
|
||||
* Sat Apr 23 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-4mdk
|
||||
- Reactivate -fvisibility
|
||||
|
||||
* Fri Apr 15 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-3mdk
|
||||
- Fix email
|
||||
- Fix spec
|
||||
|
||||
* Tue Apr 12 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.4.0-2mdk
|
||||
- Reactivate debug
|
||||
- Clean spec
|
||||
- Readd noatun file
|
||||
- Use --enable-new-ldflags
|
||||
|
||||
* Thu Apr 07 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.4.0-1mdk
|
||||
- 3.4.0
|
||||
|
||||
* Tue Mar 08 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-14mdk
|
||||
- Add patch4: fix xmms applet
|
||||
|
||||
* Wed Feb 23 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-13mdk
|
||||
- Fix MDK bug #13915
|
||||
|
||||
* Tue Feb 22 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-12mdk
|
||||
- Patch10: Disable relational bar
|
||||
|
||||
* Fri Feb 11 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-11mdk
|
||||
- Fix conflict found by Frank Griffin
|
||||
|
||||
* Thu Feb 10 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-10mdk
|
||||
- Disable debug
|
||||
|
||||
* Mon Jan 24 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-9mdk
|
||||
- Disable visibility for ppc
|
||||
|
||||
* Fri Jan 21 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-8mdk
|
||||
- Fix spec file
|
||||
|
||||
* Fri Jan 21 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-7mdk
|
||||
- Fix compile for atlantik designer
|
||||
|
||||
* Thu Jan 20 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-6mdk
|
||||
- Add patch9: fix konq-plugins rellink
|
||||
- Disable atlantik-designer there is a bug when I try to compile it
|
||||
|
||||
* Tue Jan 18 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-5mdk
|
||||
- Fix menu entry
|
||||
|
||||
* Mon Jan 10 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-4mdk
|
||||
- Rebuild
|
||||
|
||||
* Fri Jan 07 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-3mdk
|
||||
- Add -fvisibility
|
||||
|
||||
* Wed Dec 08 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-2mdk
|
||||
- Fix menu
|
||||
|
||||
* Tue Nov 30 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-1mdk
|
||||
- 3.3.2
|
||||
|
||||
* Tue Nov 23 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-6mdk
|
||||
- Sync with CVS
|
||||
|
||||
* Mon Nov 15 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-5mdk
|
||||
- Add requires on arts
|
||||
|
||||
* Thu Oct 28 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-4mdk
|
||||
- bye-bye %%buildfor
|
||||
|
||||
* Wed Oct 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-3mdk
|
||||
- Sync with CVS
|
||||
|
||||
* Wed Oct 13 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-2mdk
|
||||
- Deprecated mdk < 9.2
|
||||
- Remove search bar code
|
||||
|
||||
* Sat Oct 09 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-1mdk
|
||||
- 3.3.1
|
||||
|
||||
* Thu Sep 23 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-2mdk
|
||||
- Sync with CVS
|
||||
|
||||
* Sat Sep 04 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-1mdk
|
||||
- 3.3.0
|
||||
|
||||
* Sat Sep 04 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-14mdk
|
||||
- Add patch7: fix "Squeeze the urls"
|
||||
|
||||
* Tue Aug 24 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-13mdk
|
||||
- Add patch6: fix xmlcheck kde bug #82560
|
||||
|
||||
* Fri Aug 13 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-12mdk
|
||||
- Add patch5: call drakclock mdk bug #10742
|
||||
|
||||
* Tue Aug 10 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-11mdk
|
||||
- Disable debug
|
||||
|
||||
* Fri Jul 30 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-10mdk
|
||||
- Try to fix bad dependancy
|
||||
|
||||
* Fri Jul 23 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-9mdk
|
||||
- Fix spec file
|
||||
|
||||
* Thu Jul 22 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-8mdk
|
||||
- Remove rpath
|
||||
|
||||
* Wed Jul 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-7mdk
|
||||
- Rebuild with new kdelibs
|
||||
|
||||
* Tue Jul 06 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-6mdk
|
||||
- Fix requires for jpegtran (necessary to rotate jpeg image)
|
||||
|
||||
* Fri Jul 02 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-5mdk
|
||||
- Sync with CVS
|
||||
- fix flicking into searchbar
|
||||
|
||||
* Thu Jul 01 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-4mdk
|
||||
- Fix requires for konqueror-servicemenu
|
||||
|
||||
* Fri Jun 18 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-3mdk
|
||||
- Fix search bar.
|
||||
|
||||
* Thu Jun 17 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-2mdk
|
||||
- Fix some bugs into search google bar from kde 3.3
|
||||
|
||||
* Tue Jun 15 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-1mdk
|
||||
- 3.2.3
|
||||
|
||||
* Thu Jun 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-2mdk
|
||||
- Rebuild with debug
|
||||
|
||||
* Tue Apr 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-1mdk
|
||||
- 3.2.2
|
||||
|
||||
* Fri Apr 16 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.1-3mdk
|
||||
- Apply patch from gbeauchesne@mandrakesoft.com fix deps (Thanks a lot)
|
||||
|
||||
* Wed Apr 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.1-2mdk
|
||||
- Fix spec file to using rpmbuildupdate
|
||||
|
||||
* Sat Apr 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.1-1mdk
|
||||
- 3.2.1
|
||||
|
||||
* Wed Mar 31 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-16mdk
|
||||
- use %%configure
|
||||
- use mdkversion
|
||||
|
||||
* Mon Mar 22 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-15mdk
|
||||
- Fix bug #8348 don't install kdegames when we want just UA
|
||||
|
||||
* Fri Mar 05 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-14mdk
|
||||
- Fix group
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
--- kdeaddons-3.2.3/kicker-applets/kbinaryclock/kbinaryclock.cpp-- 2004-08-12 17:51:27.544970616 +0200
|
||||
+++ kdeaddons-3.2.3/kicker-applets/kbinaryclock/kbinaryclock.cpp 2004-08-12 17:51:53.191907782 +0200
|
||||
@@ -326,11 +326,7 @@ void KBinaryClock::openContextMenu() {
|
||||
preferences();
|
||||
break;
|
||||
case 103:
|
||||
- proc << locate("exe", "kdesu");
|
||||
- proc << "--nonewdcop";
|
||||
- proc << TQString("%1 clock --lang %2")
|
||||
- .arg(locate("exe", "kcmshell"))
|
||||
- .arg(KGlobal::locale()->language());
|
||||
+ proc << TQString("/usr/sbin/drakclock");
|
||||
proc.start(KProcess::DontCare);
|
||||
break;
|
||||
case 104:
|
||||
@ -1,534 +0,0 @@
|
||||
%define compile_apidox 1
|
||||
%{?_no_apidox: %{expand: %%global compile_apidox 0}}
|
||||
|
||||
%define oname kdeadmin
|
||||
%define lib_name_orig %mklibname kdeadmin
|
||||
%define lib_major 1
|
||||
%define lib_name %lib_name_orig%lib_major
|
||||
|
||||
Name: kde3-%{oname}
|
||||
Version: 3.5.12
|
||||
Release: %mkrel 1
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: K Desktop Environment - Adminstrative Tools
|
||||
URL: ftp://ftp.kde.org/pub/kde/stable/%version/src/
|
||||
Epoch: 2
|
||||
Source: ftp://ftp.kde.org/pub/kde/stable/%version/src/%oname-%version.tar.bz2
|
||||
Source1: kpackage.pamd
|
||||
Patch0: kdeadmin-post-3.5.8-add-mandriva-support.patch
|
||||
Patch1: kde-3.5.10-acinclude.patch
|
||||
#Patch2: fix_autotools.patch
|
||||
Patch3: kdebase-3.5.12-move-xdg-menu-dir.patch
|
||||
BuildRoot: %_tmppath/%name-%version-%release-root
|
||||
License: GPL
|
||||
Provides: kdeadmin3 = %epoch:%version-%release
|
||||
Provides: %{oname} = %epoch:%version-%release
|
||||
Obsoletes: %{oname}
|
||||
Obsoletes: kdeadmin3
|
||||
Obsoletes: %lib_name < 2:3.5.9
|
||||
Requires: pciutils
|
||||
BuildRequires: X11-devel
|
||||
BuildRequires: freetype2-devel
|
||||
BuildRequires: kdelibs-devel >= 3.2-13mdk
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: jpeg-devel
|
||||
BuildRequires: lcms-devel
|
||||
BuildRequires: mng-devel
|
||||
BuildRequires: png-devel
|
||||
BuildRequires: qt3-devel
|
||||
BuildRequires: kde3-macros
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
%endif
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
BuildRequires: automake > 1.5
|
||||
BuildRequires: rpm-devel libz-devel
|
||||
BuildRequires: pam-devel
|
||||
# createmdkmenu
|
||||
BuildRequires: kdelibs-common >= 3.1.93-5mdk
|
||||
%ifarch %{ix86} x86_64
|
||||
BuildRequires: lilo
|
||||
%endif
|
||||
|
||||
%description
|
||||
The kdeadmin package contains packages that usually only a system
|
||||
administrator might need:
|
||||
- kcmlinuz
|
||||
Linux Kernel configurator
|
||||
- kcron
|
||||
Editor for the cron command scheduler.
|
||||
- kdat
|
||||
Tape backup tool.
|
||||
- kfile-plugins
|
||||
Make Konquerer display additional info on about *.dep and *.rpm files.
|
||||
- ksysv
|
||||
An editor for System V startup schemes.
|
||||
- kuser
|
||||
An user manager.
|
||||
- kwuftpd
|
||||
Front end to the wu-ftpd FTP daemon.
|
||||
- lilo-config
|
||||
A plugin for KControl to manage the Linux boot loader LILO.
|
||||
- secpolicy
|
||||
A program to display PAM security policies.
|
||||
|
||||
%post
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%postun
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc %_kde3_docdir/HTML/en/kcron
|
||||
%doc %_kde3_docdir/HTML/en/kuser
|
||||
%doc %_kde3_docdir/HTML/en/kdat
|
||||
%_kde3_datadir/applications/kde/kcron.desktop
|
||||
%_kde3_datadir/applications/kde/kdat.desktop
|
||||
%_kde3_datadir/applications/kde/kuser.desktop
|
||||
%_kde3_bindir/kcron
|
||||
%_kde3_bindir/kuser
|
||||
%_kde3_bindir/secpolicy
|
||||
%_kde3_bindir/kdat
|
||||
%dir %_kde3_appsdir/kcron
|
||||
%_kde3_appsdir/kcron/*
|
||||
%dir %_kde3_appsdir/kuser/
|
||||
%_kde3_appsdir/kuser/*
|
||||
%dir %_kde3_appsdir/kdat
|
||||
%_kde3_appsdir/kdat/*
|
||||
%dir %_kde3_appsdir/knetworkconf/
|
||||
%_kde3_appsdir/knetworkconf/*
|
||||
%_kde3_datadir/config.kcfg/kuser.kcfg
|
||||
%_kde3_datadir/services/*.desktop
|
||||
%_kde3_datadir/applications/kde/kcm_knetworkconfmodule.desktop
|
||||
%_kde3_libdir/kde3/kfile_*.*
|
||||
%_kde3_libdir/pkgconfig/system-tools-backends.pc
|
||||
%_kde3_libdir/kde3/kcm_knetworkconfmodule*
|
||||
%doc %_kde3_docdir/HTML/en/knetworkconf/*.png
|
||||
%doc %_kde3_docdir/HTML/en/knetworkconf/common
|
||||
%doc %_kde3_docdir/HTML/en/knetworkconf/index.cache.bz2
|
||||
%doc %_kde3_docdir/HTML/en/knetworkconf/index.docbook
|
||||
%_kde3_iconsdir/*/*/*/*
|
||||
%exclude %_kde3_iconsdir/*/*/*/ksysv.png
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
|
||||
%package -n %{name}-kpackage
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: Manager for DEB, RPM
|
||||
Requires: kde3-kdeadmin = %epoch:%version-%release
|
||||
Obsoletes: kpackage < 2:3.4.3
|
||||
Provides: kde3-kpackage = %epoch:%version-%release
|
||||
Provides: kdeadmin3-kpackage = %epoch:%version-%release
|
||||
Provides: %{oname}-kpackage = %epoch:%version-%release
|
||||
Obsoletes: %{oname}-kpackage
|
||||
Obsoletes: kdeadmin3-kpackage
|
||||
|
||||
|
||||
%description -n %{name}-kpackage
|
||||
Kpackage is a package manager that is integrated into the K Desktop
|
||||
Environemnt. It works with the KDE File Manager to manage DEB, RPM
|
||||
and Slackware tgz software packages.
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n %{name}-kpackage
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %{name}-kpackage
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files -n %{name}-kpackage
|
||||
%defattr(-,root,root)
|
||||
%_kde3_bindir/kpackage
|
||||
%dir %_sysconfdir/pam.d/
|
||||
%config(noreplace) %_sysconfdir/pam.d/kpackage
|
||||
%doc %_kde3_docdir/HTML/en/kpackage
|
||||
%_kde3_iconsdir/*/*/*/kpackage.png
|
||||
%_kde3_datadir/applications/kde/kpackage.desktop
|
||||
%dir %_kde3_appsdir/kpackage
|
||||
%_kde3_appsdir/kpackage/*
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
|
||||
%package -n %{name}-ksysv
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: Edit your SysV-style init configuration
|
||||
Provides: kde3-ksysv = %epoch:%version-%release
|
||||
Provides: kdeadmin3-ksysv = %epoch:%version-%release
|
||||
Provides: %{oname}-ksysv = %epoch:%version-%release
|
||||
Obsoletes: %{oname}-ksysv
|
||||
Obsoletes: kdeadmin3-ksysv
|
||||
|
||||
|
||||
%description -n %{name}-ksysv
|
||||
SysV-Init Editor lets you edit your SysV-style init configuration
|
||||
using drag'n'drop.
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n %{name}-ksysv
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %{name}-ksysv
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files -n %{name}-ksysv
|
||||
%defattr(-,root,root)
|
||||
%_kde3_bindir/ksysv
|
||||
%dir %_kde3_appsdir/ksysv/
|
||||
%_kde3_appsdir/ksysv/*
|
||||
%_kde3_datadir/applications/kde/ksysv.desktop
|
||||
%_kde3_appsdir/ksysv/*.rc
|
||||
%_kde3_iconsdir/*/*/*/ksysv.png
|
||||
%doc %_kde3_docdir/HTML/en/ksysv
|
||||
%_kde3_datadir/mimelnk/application/x-ksysv.desktop
|
||||
%_kde3_datadir/mimelnk/text/x-ksysv-log.desktop
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
|
||||
%ifnarch ppc
|
||||
%package lilo
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: Configure lilo
|
||||
Requires: kde3-kdeadmin = %epoch:%version-%release
|
||||
Provides: kdeadmin3-lilo = %epoch:%version-%release
|
||||
Provides: %{oname}-lilo = %epoch:%version-%release
|
||||
Obsoletes: %{oname}-lilo
|
||||
Obsoletes: kdeadmin3-lilo
|
||||
|
||||
%description lilo
|
||||
lilo-config is a kcontrol plugin for configuring LILO, the most commonly
|
||||
used Linux boot loader.
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post lilo
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun lilo
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files lilo
|
||||
%defattr(-,root,root)
|
||||
%_kde3_datadir/applications/kde/lilo.desktop
|
||||
%doc %_kde3_docdir/HTML/en/lilo-config
|
||||
%_kde3_libdir/kde3/kcm_lilo.*
|
||||
|
||||
%endif
|
||||
|
||||
#------------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q -n %{oname}-%{version}
|
||||
%patch0 -p0
|
||||
%if %mdkversion >= 201000
|
||||
%patch1 -p1
|
||||
#%patch2 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
export QTDIR=%_prefix/lib/qt3
|
||||
|
||||
PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
|
||||
export xdg_menudir=%_sysconfdir/xdg/kde/menus
|
||||
|
||||
make -f admin/Makefile.common cvs
|
||||
|
||||
%configure_kde3 \
|
||||
--with-rpm \
|
||||
--with-pam=kde \
|
||||
--with-quota \
|
||||
--with-nis \
|
||||
--with-homeprefix=/home \
|
||||
--with-private-groups
|
||||
|
||||
%make
|
||||
|
||||
|
||||
%install
|
||||
rm -fr %buildroot
|
||||
|
||||
make install DESTDIR=%buildroot
|
||||
|
||||
# Install kdebase pam configuration file
|
||||
install -d %buildroot/%_sysconfdir/pam.d
|
||||
install -m644 %SOURCE1 %buildroot/%_sysconfdir/pam.d/kpackage
|
||||
|
||||
rm -rf %buildroot/%_kde3_datadir/applnk/Settings/Peripherals/
|
||||
|
||||
%ifarch ppc
|
||||
rm -rf %buildroot/%_kde3_docdir/HTML/en/lilo-config
|
||||
%endif
|
||||
|
||||
%clean
|
||||
rm -fr %buildroot
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
|
||||
* Wed Jul 20 2011 Tim Williams <tim@my-place.org.uk> 2:3.5.12-1mvt2010.2
|
||||
+ Update sources for Trinity
|
||||
+ Add kdebase-3.5.12-move-xdg-menu-dir.patch
|
||||
- Remove fix_autotools.patch
|
||||
|
||||
* Mon Jul 19 2010 Tim Williams <tim@my-place.org.uk> 2:3.5.10-4mvt2010.1
|
||||
+ Rebuild for MDV 2010.1
|
||||
|
||||
* Sun Jan 17 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2:3.5.10-3mvt2010.0
|
||||
+ KDE builds with autoconf 2.65, add patch for this and
|
||||
set autoconf to version 2.65:patch1
|
||||
+ Fix automake 1.11 issue:patch2
|
||||
|
||||
* Fri Nov 13 2009 Tim Williams <tim@my-place.org.uk> 2:3.5.10-2mdv2010.0
|
||||
+ Rebuild for MDV 2010.0
|
||||
+ kdeadmin-post-3.5.8-add-mandriva-support.patch was failing - remade and fixed
|
||||
|
||||
* Fri Aug 29 2008 Helio Chissini de Castro <helio@mandriva.com> 2:3.5.10-1mdv2009.0
|
||||
+ Revision: 277481
|
||||
- Update for last kde3 updates
|
||||
|
||||
* Fri Aug 08 2008 Thierry Vignaud <tvignaud@mandriva.com> 2:3.5.9-5mdv2009.0
|
||||
+ Revision: 267767
|
||||
- rebuild early 2009.0 package (before pixel changes)
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
|
||||
- do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
|
||||
|
||||
* Sun Jun 08 2008 Funda Wang <fundawang@mandriva.org> 2:3.5.9-4mdv2009.0
|
||||
+ Revision: 216910
|
||||
- Rebuild for new ldflags
|
||||
|
||||
* Mon May 19 2008 Rodrigo Gonçalves de Oliveira <rodrigo@mandriva.com> 2:3.5.9-3mdv2009.0
|
||||
+ Revision: 209004
|
||||
- User versioned obsoletes
|
||||
|
||||
* Thu May 08 2008 Helio Chissini de Castro <helio@mandriva.com> 2:3.5.9-2mdv2009.0
|
||||
+ Revision: 204575
|
||||
- Move to /opt
|
||||
|
||||
* Fri Feb 15 2008 Helio Chissini de Castro <helio@mandriva.com> 2:3.5.9-1mdv2008.1
|
||||
+ Revision: 168995
|
||||
- Get away from branches. Last KDE 3 arriving !!
|
||||
- Removed post-3.5.8 patches integrated
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
* Mon Dec 31 2007 Oden Eriksson <oeriksson@mandriva.com> 2:3.5.8-2mdv2008.1
|
||||
+ Revision: 139861
|
||||
- rebuilt against openldap-2.4.7 libs
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- Add patch0 : it added the support of mandriva 2008.0
|
||||
and the upcoming 2008.1 in knetworkconf
|
||||
|
||||
* Wed Oct 24 2007 Nicolas Lécureuil <neoclust@mandriva.org> 2:3.5.8-1mdv2008.1
|
||||
+ Revision: 101713
|
||||
- Kde 3.5.8
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- fix summary-ended-with-dot
|
||||
|
||||
* Thu Sep 20 2007 Nicolas Lécureuil <neoclust@mandriva.org> 2:3.5.7-3mdv2008.0
|
||||
+ Revision: 91480
|
||||
- Rebuild because of missing packages
|
||||
|
||||
* Wed Aug 08 2007 Funda Wang <fundawang@mandriva.org> 2:3.5.7-2mdv2008.0
|
||||
+ Revision: 60515
|
||||
- drop old menu
|
||||
|
||||
* Wed May 16 2007 Helio Chissini de Castro <helio@mandriva.com> 2:3.5.7-1mdv2008.0
|
||||
+ Revision: 27453
|
||||
- 3.5.7 release
|
||||
|
||||
|
||||
* Thu Feb 01 2007 Laurent Montel <lmontel@mandriva.com> 3.5.6-1mdv2007.0
|
||||
+ Revision: 115846
|
||||
- 3.5.6
|
||||
|
||||
* Wed Jan 24 2007 Laurent Montel <lmontel@mandriva.com> 2:3.5.5-5mdv2007.1
|
||||
+ Revision: 112738
|
||||
- Not necessary
|
||||
- Rebuild against new python
|
||||
|
||||
* Fri Nov 03 2006 Laurent Montel <lmontel@mandriva.com> 2:3.5.5-3mdv2007.1
|
||||
+ Revision: 76120
|
||||
- Add knetworkconf 2007.1 support
|
||||
(Bug found by Nicolas Chipaux)
|
||||
|
||||
* Fri Oct 20 2006 Laurent Montel <lmontel@mandriva.com> 2:3.5.5-2mdv2007.0
|
||||
+ Revision: 71233
|
||||
- 3.5.5
|
||||
- Revert: "it's new lilo is supported by ppc ?????"
|
||||
|
||||
+ Helio Chissini de Castro <helio@mandriva.com>
|
||||
- Back to use branch tarballs. Now using post 3.5.5
|
||||
- Fixed cross compiling when using no-enable-final
|
||||
|
||||
* Sat Aug 12 2006 Laurent Montel <lmontel@mandriva.com> 2:3.5.4-3mdv2007.0
|
||||
+ Revision: 55570
|
||||
- New package (2006/08/11 3.5.4-3mdv)
|
||||
Add patch to fix knetworkconf signal/slot conflict
|
||||
|
||||
* Fri Aug 11 2006 Laurent Montel <lmontel@mandriva.com> 2:3.5.4-2mdv2007.0
|
||||
+ Revision: 55299
|
||||
- New package (2006/08/10 - 3.5.4-2mdv)
|
||||
knetworkconf: add support for Mandriva 2007
|
||||
- 3.5.4
|
||||
New release (2006/08/02 3.5.4-1mdv)
|
||||
--enable-new-ldflags doesn't work on x86_64
|
||||
- 3.5.3
|
||||
Fix pamd files
|
||||
- Rebuild for generate category in menu
|
||||
- 3.5.2
|
||||
- Fix build on ppc but reported by Christiaan Welvaart
|
||||
- 3.5.1
|
||||
- Enable debug only cooker
|
||||
MDK9.2 is obsolete now
|
||||
- Real kde 3.5
|
||||
- Complet fix of patch
|
||||
- Fix kdenetwork conf to detect mandriva
|
||||
- 3.5.0
|
||||
- 3.4.92
|
||||
- Fix build on x86_64 (gb patch)
|
||||
- Rebuild
|
||||
Use %%mkrel
|
||||
- Fix email
|
||||
- Rebuild
|
||||
- Remove debug
|
||||
Sync with kde 3.4.2 branch
|
||||
- Rebuild for missing package
|
||||
- 3.4.2
|
||||
|
||||
+ Helio Chissini de Castro <helio@mandriva.com>
|
||||
- Cleaned spec
|
||||
- Added tarball from kde branch as discussed on meeting in 28/06
|
||||
- Removed rpath and added configure macro invalidating libtoolize
|
||||
- We are Mandriva now
|
||||
- Uploading package ./kdeadmin
|
||||
|
||||
+ Andreas Hasenack <andreas@mandriva.com>
|
||||
- renamed mdv to packages because mdv is too generic and it's hosting only packages anyway
|
||||
|
||||
* Thu May 05 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-3mdk
|
||||
- Rebuild with new GCC
|
||||
|
||||
* Tue Apr 12 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.4.0-2mdk
|
||||
- Enable debug
|
||||
- Use --enable-new-ldflags
|
||||
- Remove old patch
|
||||
|
||||
* Tue Apr 05 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.4.0-1mdk
|
||||
- 3.4.0
|
||||
|
||||
* Thu Feb 10 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-6mdk
|
||||
- Disable debug
|
||||
|
||||
* Fri Jan 28 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-5mdk
|
||||
- Fix generated menu entry
|
||||
|
||||
* Mon Jan 24 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-4mdk
|
||||
- Fix buildrequires for ppc
|
||||
|
||||
* Fri Dec 10 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-3mdk
|
||||
- Fix category
|
||||
|
||||
* Wed Dec 08 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-2mdk
|
||||
- Fix menu
|
||||
|
||||
* Fri Dec 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-1mdk
|
||||
- 3.3.2
|
||||
|
||||
* Wed Oct 27 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-3mdk
|
||||
- Delete %%buildfor
|
||||
|
||||
* Wed Oct 13 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-2mdk
|
||||
- Deprecated mdk < 9.2
|
||||
|
||||
* Fri Oct 08 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-1mdk
|
||||
- 3.3.1
|
||||
|
||||
* Fri Oct 01 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-2mdk
|
||||
- Add buildrequires lilo
|
||||
|
||||
* Fri Sep 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-1mdk
|
||||
- 3.3.0
|
||||
|
||||
* Thu Aug 26 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-6mdk
|
||||
- Fix spec file
|
||||
|
||||
* Tue Aug 10 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-5mdk
|
||||
- Remove debug
|
||||
|
||||
* Wed Aug 04 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-4mdk
|
||||
- Fix spec file
|
||||
|
||||
* Thu Jul 22 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-3mdk
|
||||
- Add patch15: fix remove rpath (patch from gb)
|
||||
|
||||
* Tue Jun 29 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-2mdk
|
||||
- Fix buildrequires
|
||||
|
||||
* Tue Jun 15 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-1mdk
|
||||
- 3.2.3
|
||||
|
||||
* Fri Jun 04 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-4mdk
|
||||
- Rebuild
|
||||
|
||||
* Thu Jun 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-3mdk
|
||||
- Rebuild with debug
|
||||
|
||||
* Fri May 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-2mdk
|
||||
- Rebuild again qt 3.3.2
|
||||
|
||||
* Tue Apr 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-1mdk
|
||||
- 3.2.2
|
||||
|
||||
* Wed Apr 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.1-2mdk
|
||||
- Fix spec file for using rpmbuildupdate
|
||||
|
||||
* Sat Apr 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.1-1mdk
|
||||
- 3.2.1
|
||||
|
||||
* Thu Feb 26 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-5mdk
|
||||
- Fix buildrequires for gb
|
||||
|
||||
* Fri Feb 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-4mdk
|
||||
- Split ksysv
|
||||
- Fix menu entry
|
||||
|
||||
* Mon Feb 16 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-3mdk
|
||||
- Rebuild with good kdedesktop2mdkmenu.pl
|
||||
|
||||
* Mon Feb 09 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-2mdk
|
||||
- Sync with CVS
|
||||
|
||||
* Tue Feb 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-1mdk
|
||||
- 3.2
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
--- knetworkconf/backends/service.pl.in.orig 2008-08-19 18:10:46.000000000 +0000
|
||||
+++ knetworkconf/backends/service.pl.in 2009-11-13 17:30:40.000000000 +0000
|
||||
@@ -72,6 +72,8 @@
|
||||
"mandriva-2006.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
||||
"mandriva-2007.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
||||
"mandriva-2007.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
||||
+ "mandriva-2008.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
||||
+ "mandriva-2008.1" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
||||
"yoper-2.2" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
||||
|
||||
"blackpanther-4.0" => ["$gst_prefix/etc/rc.d", "$gst_prefix/etc/rc.d/init.d", "../init.d"],
|
||||
@@ -151,6 +153,8 @@
|
||||
"mandriva-2006.1" => [3, 5],
|
||||
"mandriva-2007.0" => [3, 5],
|
||||
"mandriva-2007.1" => [3, 5],
|
||||
+ "mandriva-2008.0" => [3, 5],
|
||||
+ "mandriva-2008.1" => [3, 5],
|
||||
|
||||
"yoper-2.2" => [3, 5],
|
||||
|
||||
@@ -230,6 +234,8 @@
|
||||
"mandriva-2006.1" => "redhat-5.2",
|
||||
"mandriva-2007.0" => "redhat-5.2",
|
||||
"mandriva-2007.1" => "redhat-5.2",
|
||||
+ "mandriva-2008.0" => "redhat-5.2",
|
||||
+ "mandriva-2008.1" => "redhat-5.2",
|
||||
|
||||
"yoper-2.2" => "redhat-5.2",
|
||||
|
||||
@ -1,5 +0,0 @@
|
||||
#%PAM-1.0
|
||||
auth sufficient pam_rootok.so
|
||||
auth required pam_pwdb.so
|
||||
session optional pam_xauth.so
|
||||
account required pam_permit.so
|
||||
@ -1,66 +0,0 @@
|
||||
2009-12-10 Stepan Kasal <skasal@redhat.com>
|
||||
|
||||
The change of implementation of AC_REQUIRE in 2.64 caused a regression
|
||||
in the arts project.
|
||||
This can be fixed by shuffling some macro calls.
|
||||
|
||||
I suppose that most of this patch will not be needed with a future
|
||||
release of Autoconf.
|
||||
But the last chunk of this patch is a real bug in this source and
|
||||
should go upstream.
|
||||
|
||||
--- arts-1.5.10/admin/acinclude.m4.in 2008-08-20 18:07:05.000000000 +0200
|
||||
+++ arts-1.5.10/admin/acinclude.m4.in 2009-12-09 17:30:57.000000000 +0100
|
||||
@@ -3081,8 +3081,18 @@
|
||||
fi
|
||||
])
|
||||
|
||||
+AC_DEFUN([AC_CHECK_COMPILERS_CC],
|
||||
+[
|
||||
+ dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
|
||||
+ CFLAGS=" $CFLAGS"
|
||||
+ AC_PROG_CC
|
||||
+ CXXFLAGS=" $CXXFLAGS"
|
||||
+ AC_PROG_CXX
|
||||
+])
|
||||
+
|
||||
AC_DEFUN([AC_CHECK_COMPILERS],
|
||||
[
|
||||
+ AC_REQUIRE([AC_CHECK_COMPILERS_CC])
|
||||
AC_ARG_ENABLE(debug,
|
||||
AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
|
||||
[
|
||||
@@ -3141,11 +3151,6 @@
|
||||
[kde_use_profiling="no"]
|
||||
)
|
||||
|
||||
- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
|
||||
- CFLAGS=" $CFLAGS"
|
||||
-
|
||||
- AC_PROG_CC
|
||||
-
|
||||
AC_PROG_CPP
|
||||
|
||||
if test "$GCC" = "yes"; then
|
||||
@@ -3174,10 +3179,6 @@
|
||||
LDFLAGS=""
|
||||
fi
|
||||
|
||||
- CXXFLAGS=" $CXXFLAGS"
|
||||
-
|
||||
- AC_PROG_CXX
|
||||
-
|
||||
KDE_CHECK_FOR_BAD_COMPILER
|
||||
|
||||
if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
|
||||
@@ -3503,8 +3504,8 @@
|
||||
AC_REQUIRE([AC_LIBTOOL_DLOPEN])
|
||||
AC_REQUIRE([KDE_CHECK_LIB64])
|
||||
|
||||
-AC_OBJEXT
|
||||
-AC_EXEEXT
|
||||
+AC_REQUIRE([AC_OBJEXT])
|
||||
+AC_REQUIRE([AC_EXEEXT])
|
||||
|
||||
AM_PROG_LIBTOOL
|
||||
AC_LIBTOOL_CXX
|
||||
@ -1,521 +0,0 @@
|
||||
%define oname kdeartwork
|
||||
|
||||
Name: kde3-%{oname}
|
||||
Version: 3.5.12
|
||||
Release: %mkrel 1
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: Kdeartwork
|
||||
URL: http://www.kde.org
|
||||
License: GPL
|
||||
Source: ftp://ftp.kde.org/pub/kde/stable/%version/src/%oname-%version.tar.bz2
|
||||
Patch1: kdeartwork-3.5.4-fix-screensaver-only-showin-kde.patch
|
||||
Patch2: kdeartwork-3.5.5-fix-default-inherits-theme.patch
|
||||
#Patch3: kdeartwork-3.5.6-fix-screensaver-nodisplay.patch
|
||||
Patch4: kde-3.5.10-acinclude.patch
|
||||
#Patch5: fix_autotools.patch
|
||||
|
||||
BuildRoot: %_tmppath/%name-%version-%release-root
|
||||
|
||||
BuildRequires: kde3-macros
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
%endif
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
BuildRequires: automake > 1.5
|
||||
BuildRequires: X11-devel
|
||||
BuildRequires: freetype2-devel
|
||||
BuildRequires: kdebase3-devel
|
||||
BuildRequires: kdelibs-devel >= 3.2-13mdk
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: libintl
|
||||
BuildRequires: jpeg-devel
|
||||
BuildRequires: lcms-devel
|
||||
BuildRequires: mng-devel
|
||||
BuildRequires: png-devel
|
||||
BuildRequires: qt3-devel
|
||||
BuildRequires: libz-devel
|
||||
BuildRequires: xscreensaver
|
||||
BuildRequires: xscreensaver-gl
|
||||
BuildRequires: mesaglut-devel
|
||||
BuildRequires: mesaglu-devel
|
||||
BuildRequires: GL-devel
|
||||
Requires: kdebase-progs >= 1:3.2
|
||||
Requires: kdeartwork-screensavers
|
||||
Provides: kdeartwork3 = %version-%release
|
||||
Provides: %{oname} = %version-%release
|
||||
Provides: kde-style-phase
|
||||
Provides: kde-theme-phase
|
||||
Provides: kwin-style-smoothblend
|
||||
Obsoletes: kdemoreartwork-plastik < 3.5.3
|
||||
Obsoletes: kde-style-phase kde-theme-phase
|
||||
Obsoletes: kwin-style-smoothblend
|
||||
Obsoletes: kdeartwork3
|
||||
Obsoletes: %{oname}
|
||||
Conflicts: kdebase <= 2.2.2-93mdk
|
||||
Conflicts: libkdebase4 <= 1:3.4.2-56mdk
|
||||
Conflicts: kdebase-common <= 1:3.4.2-56mdk
|
||||
|
||||
%description
|
||||
Additional artwork (themes, sound themes, icons,etc...) for KDE.
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_libdir/kde3/*
|
||||
%_kde3_appsdir/kstyle
|
||||
%_kde3_appsdir/kwin
|
||||
%_kde3_appsdir/kworldclock
|
||||
%_kde3_datadir/emoticons/*
|
||||
%_kde3_datadir/wallpapers/*
|
||||
%_kde3_datadir/sounds/*
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
%package icons-theme-kdeclassic
|
||||
Summary: Default Icons from kde3.0
|
||||
Group: Graphical desktop/KDE3
|
||||
Obsoletes: kdeartwork-kde-classic
|
||||
Provides: %{oname}-icons-theme-kdeclassic = %version-%release
|
||||
Obsoletes: %{oname}-icons-theme-kdeclassic
|
||||
|
||||
%description icons-theme-kdeclassic
|
||||
Default Icons from kde3.0.
|
||||
|
||||
%files icons-theme-kdeclassic
|
||||
%defattr(-,root,root,-)
|
||||
%dir %_kde3_iconsdir/kdeclassic/
|
||||
%_kde3_iconsdir/kdeclassic/*
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
%package icons-theme-Locolor
|
||||
Summary: Default Icons from kde3.0
|
||||
Group: Graphical desktop/KDE3
|
||||
Provides: %{oname}-icons-theme-Locolor = %version-%release
|
||||
Obsoletes: %{oname}-icons-theme-Locolor
|
||||
|
||||
%description icons-theme-Locolor
|
||||
Locolor icons theme
|
||||
|
||||
%files icons-theme-Locolor
|
||||
%defattr(-,root,root,-)
|
||||
%dir %_kde3_iconsdir/Locolor/
|
||||
%_kde3_iconsdir/Locolor/*
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
%package icons-theme-ikons
|
||||
Summary: Default Icons from kde3.0
|
||||
Group: Graphical desktop/KDE3
|
||||
Provides: %{oname}-icons-theme-ikons = %version-%release
|
||||
Obsoletes: %{oname}-icons-theme-ikons
|
||||
|
||||
%description icons-theme-ikons
|
||||
ikons icons theme
|
||||
|
||||
%files icons-theme-ikons
|
||||
%defattr(-,root,root,-)
|
||||
%dir %_kde3_iconsdir/ikons/
|
||||
%_kde3_iconsdir/ikons/*
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
%package icons-theme-kids
|
||||
Summary: Default Icons from kde3.0
|
||||
Group: Graphical desktop/KDE3
|
||||
Provides: %{oname}-icons-theme-kids = %version-%release
|
||||
Obsoletes: %{oname}-icons-theme-kids
|
||||
|
||||
%description icons-theme-kids
|
||||
kids icons theme
|
||||
|
||||
%files icons-theme-kids
|
||||
%defattr(-,root,root,-)
|
||||
%dir %_kde3_iconsdir/kids/
|
||||
%_kde3_iconsdir/kids/*
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
%package icons-theme-slick
|
||||
Summary: Default Icons from kde3.0
|
||||
Group: Graphical desktop/KDE3
|
||||
Provides: %{oname}-icons-theme-slick = %version-%release
|
||||
Obsoletes: %{oname}-icons-theme-slick
|
||||
|
||||
%description icons-theme-slick
|
||||
Slick icons theme
|
||||
|
||||
%files icons-theme-slick
|
||||
%defattr(-,root,root,-)
|
||||
%dir %_kde3_iconsdir/slick/
|
||||
%_kde3_iconsdir/slick/*
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
%package screensavers
|
||||
Summary: Screensaver using OpenGL
|
||||
Group: Graphical desktop/KDE3
|
||||
Requires: kdebase-progs >= 3.2
|
||||
Obsoletes: kdeartwork <= 3.5.7-%mkrel 2
|
||||
Provides: %{oname}-screensavers = %version-%release
|
||||
Obsoletes: %{oname}-screensavers
|
||||
|
||||
%description screensavers
|
||||
Screensaver using OpenGL.
|
||||
|
||||
%files screensavers -f savers.files
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_appsdir/kfiresaver
|
||||
%_kde3_appsdir/kscreensaver
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
%package screensavers-gl
|
||||
Summary: Screensaver using OpenGL
|
||||
Group: Graphical desktop/KDE3
|
||||
Requires: kdebase-progs >= 3.2
|
||||
Requires: %name-screensavers
|
||||
Requires: xscreensaver-gl
|
||||
Obsoletes: kdeartwork <= 3.5.7-%mkrel 2
|
||||
Obsoletes: kdeartwork-screensaver-gl
|
||||
Provides: %{oname}-screensavers-gl = %version-%release
|
||||
Obsoletes: %{oname}-screensavers-gl
|
||||
|
||||
%description screensavers-gl
|
||||
Screensaver using OpenGL.
|
||||
|
||||
%files screensavers-gl -f glsavers.files
|
||||
%defattr(-,root,root,-)
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q -n %{oname}-%{version}
|
||||
%patch1 -p1 -b .fix_screensaver_onlyshowinkde
|
||||
%patch2 -p1 -b .fix_inherit_theme
|
||||
#%patch3 -p1 -b .fix_screensaver_nodisplay
|
||||
%if %mdkversion >= 201000
|
||||
%patch4 -p1
|
||||
#%patch5 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
make -f admin/Makefile.common cvs
|
||||
|
||||
PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
|
||||
|
||||
%configure_kde3
|
||||
|
||||
%make
|
||||
|
||||
|
||||
%install
|
||||
rm -fr %buildroot
|
||||
|
||||
make install DESTDIR=%buildroot
|
||||
|
||||
install -d %buildroot/%_menudir/
|
||||
|
||||
export PATH=%_kde3_bindir:$PATH
|
||||
|
||||
# Legal issues ?
|
||||
rm -f %buildroot/%_kde3_bindir/kmatrix.kss
|
||||
rm -f %buildroot/%_kde3_datadir/applnk/System/ScreenSavers/KMatrix.desktop
|
||||
rm -f %buildroot/%_kde3_datadir/applnk/System/ScreenSavers/glmatrix.desktop
|
||||
rm -f %buildroot/%_kde3_datadir/applnk/System/ScreenSavers/xmatrix.desktop
|
||||
|
||||
# Screensaver list
|
||||
rm -f glsavers.files savers.files
|
||||
for name in `find %buildroot -type f |grep ScreenSaver`; do
|
||||
if grep -qs "Type=OpenGL" $name; then
|
||||
echo $name | sed -e "s,%buildroot%_kde3_datadir,%_kde3_datadir,g" >> glsavers.files
|
||||
if ! grep -qs "TryExec=xscreensaver" $name; then
|
||||
grep Exec= $name | grep -v TryExec | head -1 | sed -e "s,Exec=,%_kde3_bindir/,g" -e "s, .*,,g" >> glsavers.files
|
||||
fi
|
||||
else
|
||||
echo $name | sed -e "s,%buildroot%_kde3_datadir,%_kde3_datadir,g" >> savers.files
|
||||
if ! grep -qs "TryExec=xscreensaver" $name; then
|
||||
if ! grep -qs "fiberlamp" $name; then
|
||||
grep Exec= $name | grep -v TryExec | head -1 | sed -e "s,Exec=,%_kde3_bindir/,g" -e "s, .*,,g" >> savers.files
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
done
|
||||
|
||||
%clean
|
||||
rm -fr %buildroot
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
|
||||
* Mon Jul 19 2010 Tim Williams <tim@my-place.org.uk> 3.5.12-1mvf2010.2
|
||||
+ Rebuild for MDV 2010.2/Trinity
|
||||
+ Added KDE/Trinity 3.5.12 sources
|
||||
- Remove fix_autotools.patch, kdeartwork-3.5.6-fix-screensaver-nodisplay.patch
|
||||
|
||||
* Mon Jul 19 2010 Tim Williams <tim@my-place.org.uk> 3.5.10-4mvt2010.1
|
||||
+ Rebuild for MDV 2010.1
|
||||
|
||||
* Sun Jan 17 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 3.5.10-3mvt2010.0
|
||||
+ KDE builds with autoconf 2.65, add patch for this and
|
||||
set autoconf to version 2.65:patch4
|
||||
+ Fix automake 1.11 issue:patch5
|
||||
+ Rename package to avoid KDE4 conflicts
|
||||
|
||||
* Mon Nov 16 2009 Tim Williams <tim@my-place.org.uk> 3.5.10-1mdv2010.0
|
||||
+ Add kde 3.5.10 sources package
|
||||
+ Fix kdeartwork-3.5.4-fix-screensaver-only-showin-kde.patch
|
||||
+ Fix kdeartwork-3.5.6-fix-screensaver-nodisplay.patch
|
||||
|
||||
* Fri Aug 08 2008 Thierry Vignaud <tvignaud@mandriva.com> 3.5.9-6mdv2009.0
|
||||
+ Revision: 267768
|
||||
- rebuild early 2009.0 package (before pixel changes)
|
||||
|
||||
* Wed Jun 11 2008 Funda Wang <fundawang@mandriva.org> 3.5.9-5mdv2009.0
|
||||
+ Revision: 217839
|
||||
- rebuid for new rpm binary payload
|
||||
|
||||
* Sun Jun 08 2008 Funda Wang <fundawang@mandriva.org> 3.5.9-4mdv2009.0
|
||||
+ Revision: 216918
|
||||
- rebuild for new ldflags
|
||||
|
||||
* Wed May 07 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-3mdv2009.0
|
||||
+ Revision: 203697
|
||||
- Move to /opt
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- Rebuild for backports
|
||||
|
||||
* Fri Feb 15 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.9-1mdv2008.1
|
||||
+ Revision: 169159
|
||||
- Get away from branches. Last KDE 3 arriving !!
|
||||
- Removed post-3.5.8 patches integrated
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- fix summary-not-capitalized
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
* Mon Dec 31 2007 Oden Eriksson <oeriksson@mandriva.com> 3.5.8-2mdv2008.1
|
||||
+ Revision: 139862
|
||||
- rebuilt against openldap-2.4.7 libs
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- Add usptream 3.5.9 branch patches
|
||||
- Be more random with the slideshow screensaver.
|
||||
- Handle properly display height/width ratio.
|
||||
|
||||
* Sun Oct 28 2007 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.8-1mdv2008.1
|
||||
+ Revision: 102776
|
||||
- Kde 3.5.8
|
||||
|
||||
* Sat Jun 09 2007 Helio Chissini de Castro <helio@mandriva.com> 3.5.7-3mdv2008.0
|
||||
+ Revision: 37629
|
||||
- Split packages
|
||||
- Remove broken changelog on spec
|
||||
- Separate screensaver and icon packages properly
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- Add a Obsoletes for kwin-style-smoothblend (bug #25452)
|
||||
|
||||
* Wed May 16 2007 Helio Chissini de Castro <helio@mandriva.com> 3.5.7-1mdv2008.0
|
||||
+ Revision: 27459
|
||||
- 3.5.7 release
|
||||
|
||||
|
||||
* Sat Mar 31 2007 Laurent Montel <lmontel@mandriva.com> 3.5.6-2mdv2007.1
|
||||
+ Revision: 149988
|
||||
- don't display screensaver
|
||||
- 3.5.6
|
||||
- Use iconsdir macro
|
||||
- Fix inherite theme
|
||||
|
||||
* Wed Oct 18 2006 Laurent Montel <lmontel@mandriva.com> 3.5.5-1mdv2007.1
|
||||
+ Revision: 65948
|
||||
- 3.5.5
|
||||
|
||||
* Sat Sep 16 2006 Laurent Montel <lmontel@mandriva.com> 3.5.4-3mdv2007.0
|
||||
+ Revision: 61557
|
||||
- New package(2006-09-15 3mdv)
|
||||
Fix only show screensaver into kde
|
||||
|
||||
* Fri Sep 01 2006 Laurent Montel <lmontel@mandriva.com> 3.5.4-2mdv2007.0
|
||||
+ Revision: 58952
|
||||
- Fix upgrade
|
||||
- New package (2006/08/04 3.5.4-1mdv)
|
||||
- don't requires on metapackage
|
||||
- Fix compile on mdk2006
|
||||
- 3.5.3
|
||||
- Rebuild against new xorg
|
||||
- Rebuild to generate category
|
||||
- Fix spec file
|
||||
- 3.5.2
|
||||
- Fix spec file
|
||||
- Fix spec file
|
||||
- 3.5.1
|
||||
- Enable debug for cooker
|
||||
MDK9.2 is obsolete now
|
||||
- Fix conflict with mdk2006
|
||||
- Fix compile on mdk <2006
|
||||
- Fix file list for mdk 2006
|
||||
- Fix spec file
|
||||
- real 3.5.0
|
||||
- 3.5.0
|
||||
- Rebuild with new qt3.3.5
|
||||
- Add conflict with kdebase
|
||||
- 3.4.92
|
||||
- Fix build on x86_64
|
||||
- Rebuild
|
||||
- Obsolete/provides kde-style-phase kde-theme-phase
|
||||
Patch from neoclust
|
||||
- 3.4.2
|
||||
|
||||
+ Helio Chissini de Castro <helio@mandriva.com>
|
||||
- Cleaned spec
|
||||
- Added tarball from kde branch as discussed on meeting in 28/06
|
||||
- Removed rpath and added configure macro invalidating libtoolize
|
||||
- We are Mandriva now
|
||||
- Uploading package ./kdeartwork
|
||||
|
||||
+ Andreas Hasenack <andreas@mandriva.com>
|
||||
- renamed mdv to packages because mdv is too generic and it's hosting only packages anyway
|
||||
|
||||
* Thu May 05 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-4mdk
|
||||
- Rebuild
|
||||
|
||||
* Wed Apr 20 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-3mdk
|
||||
- Add BuildREquires on xscreensaver-gl (reported by Arnaud de Lorbeau )
|
||||
|
||||
* Sat Apr 16 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-2mdk
|
||||
- Change email
|
||||
- Activate debug
|
||||
- Active -fvisibility same as for ppc
|
||||
- Use --enable-new-ldflags
|
||||
|
||||
* Thu Apr 07 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.4.0-1mdk
|
||||
- 3.4.0
|
||||
|
||||
* Mon Mar 07 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-14mdk
|
||||
- Rebuild
|
||||
|
||||
* Mon Feb 28 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-13mdk
|
||||
- Add patch10: fix other plastik ininitialise variable
|
||||
|
||||
* Fri Feb 25 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-12mdk
|
||||
- Add patch9: fix plastik initial variable
|
||||
|
||||
* Thu Feb 10 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-11mdk
|
||||
- Disable debug
|
||||
|
||||
* Thu Jan 27 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-10mdk
|
||||
- Fix screensaver (use directly screensaver into applnk, it's hidden by default and it fixed all bug with new xdg menu (for screensaver))
|
||||
|
||||
* Mon Jan 24 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-9mdk
|
||||
- Fix plastik kde bug #97681
|
||||
- Don't use -fvisibility for ppc
|
||||
|
||||
* Sat Jan 15 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-8mdk
|
||||
- Add patch7: allow to disable visibility
|
||||
|
||||
* Sat Jan 15 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-7mdk
|
||||
- Add patch6: fix plastik kde bug #73873
|
||||
|
||||
* Mon Jan 10 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-6mdk
|
||||
- Now plastik style
|
||||
|
||||
* Mon Jan 10 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-5mdk
|
||||
- Fix other kde_export
|
||||
|
||||
* Sat Jan 08 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-4mdk
|
||||
- Fix export into plastik style
|
||||
|
||||
* Fri Jan 07 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-3mdk
|
||||
- Use -fvisibility
|
||||
|
||||
* Wed Dec 08 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-2mdk
|
||||
- Fix menu
|
||||
|
||||
* Thu Dec 02 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-1mdk
|
||||
- 3.3.2
|
||||
|
||||
* Thu Oct 28 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-3mdk
|
||||
- Bye-bye %%buildfor
|
||||
|
||||
* Wed Oct 13 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-2mdk
|
||||
- Deprecated mdk < 9.2
|
||||
|
||||
* Sat Oct 09 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-1mdk
|
||||
- 3.3.1
|
||||
|
||||
* Sat Oct 02 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-5mdk
|
||||
- Sync with CVS
|
||||
|
||||
* Fri Oct 01 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-4mdk
|
||||
- Fix menu entry
|
||||
|
||||
* Sat Sep 11 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-3mdk
|
||||
- Remove dependance on xscreensaver
|
||||
|
||||
* Thu Sep 09 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-2mdk
|
||||
- Sync with CVS
|
||||
|
||||
* Fri Sep 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-1mdk
|
||||
- 3.3.0
|
||||
|
||||
* Wed Sep 01 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-10mdk
|
||||
- Add patch7: fix kde bug #83406 "kslideshow screensaver does not start nor
|
||||
configure when images directory does not exist anymore"
|
||||
|
||||
* Fri Aug 13 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-9mdk
|
||||
- Remove explicite requires just for icons
|
||||
|
||||
* Tue Aug 10 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-8mdk
|
||||
- Disable debug
|
||||
|
||||
* Thu Aug 05 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-7mdk
|
||||
- Add patch6: fix kde1 style kde bug #73592
|
||||
|
||||
* Fri Jul 30 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-6mdk
|
||||
- fix spec file
|
||||
|
||||
* Thu Jul 22 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-5mdk
|
||||
- Remove rpath
|
||||
|
||||
* Thu Jul 08 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-4mdk
|
||||
- Create package for opengl screensaver
|
||||
|
||||
* Wed Jul 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-3mdk
|
||||
- Rebuild with new kdedesktop2mdkmenu.pl
|
||||
|
||||
* Tue Jul 06 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-2mdk
|
||||
- Create screensaver from xscreensaver
|
||||
|
||||
* Tue Jun 15 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-1mdk
|
||||
- 3.2.3
|
||||
|
||||
* Sat Jun 05 2004 Montel Laurent <lmontel@mandrakesoft.com> 3.2.2-5mdk
|
||||
- Rebuild
|
||||
|
||||
* Wed Jun 02 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-4mdk
|
||||
- Rebuild with debug
|
||||
|
||||
* Fri May 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-3mdk
|
||||
- Rebuild against qt 3.3.2
|
||||
|
||||
* Thu Apr 22 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-2mdk
|
||||
- Fix twice 64x64 directory bug reported by Pascal BILLERY-SCHNEIDER <pascal.billery-schneider@bluewin.ch>
|
||||
|
||||
* Tue Apr 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-1mdk
|
||||
- 3.2.2
|
||||
|
||||
* Wed Apr 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.1-2mdk
|
||||
- Fix spec file to using rpmbuildupdate
|
||||
|
||||
* Sat Apr 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.1-1mdk
|
||||
- 3.2.1
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,33 +0,0 @@
|
||||
--- kdeartwork-3.5.5/IconThemes/ikons/index.theme-- 2006-11-24 14:13:05.000000000 +0100
|
||||
+++ kdeartwork-3.5.5/IconThemes/ikons/index.theme 2006-11-24 14:13:50.000000000 +0100
|
||||
@@ -67,7 +67,7 @@
|
||||
Example=exec
|
||||
LinkOverlay=link
|
||||
LockOverlay=lockoverlay
|
||||
-Inherits=default
|
||||
+Inherits=crystalsvg
|
||||
ZipOverlay=zip
|
||||
DesktopDefault=48
|
||||
DesktopSizes=16,32,48,64
|
||||
--- kdeartwork-3.5.5/IconThemes/kdeclassic/index.theme-- 2006-11-24 14:13:29.000000000 +0100
|
||||
+++ kdeartwork-3.5.5/IconThemes/kdeclassic/index.theme 2006-11-24 14:14:04.000000000 +0100
|
||||
@@ -98,7 +98,7 @@
|
||||
Comment[zu]=Ithimu Yophawu lwesithombe se-KDE Yasendulo
|
||||
DisplayDepth=32
|
||||
Example=exec
|
||||
-Inherits=default
|
||||
+Inherits=crystalsvg
|
||||
LinkOverlay=link
|
||||
LockOverlay=lockoverlay
|
||||
ZipOverlay=zip
|
||||
--- kdeartwork-3.5.5/IconThemes/Locolor/index.theme-- 2006-11-24 14:13:37.000000000 +0100
|
||||
+++ kdeartwork-3.5.5/IconThemes/Locolor/index.theme 2006-11-24 14:14:18.000000000 +0100
|
||||
@@ -98,7 +98,7 @@
|
||||
Comment[zh_CN]=低色彩图标主题
|
||||
Comment[zh_TW]=低色彩圖示主題
|
||||
Comment[zu]=Umbala ongaphansi wogcizelelo lwe Icon
|
||||
-Inherits=default
|
||||
+Inherits=crystalsvg
|
||||
DisplayDepth=8
|
||||
DesktopDefault=32
|
||||
DesktopSizes=16,32
|
||||
@ -1,33 +0,0 @@
|
||||
--- kdebase-3.5.12/kioslave/media/mediamanager/halbackend.cpp.orig 2011-02-04 15:59:27.725473830 +0000
|
||||
+++ kdebase-3.5.12/kioslave/media/mediamanager/halbackend.cpp 2011-02-04 16:00:30.800473078 +0000
|
||||
@@ -17,7 +17,6 @@
|
||||
*/
|
||||
|
||||
#include "halbackend.h"
|
||||
-#include "linuxcdpolling.h"
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <locale.h>
|
||||
@@ -586,19 +585,12 @@
|
||||
medium->setIconName(TQString::null);
|
||||
|
||||
/* check if the disc id a vcd or a video dvd */
|
||||
- DiscType type = LinuxCDPolling::identifyDiscType(libhal_volume_get_device_file(halVolume));
|
||||
- switch (type)
|
||||
- {
|
||||
- case DiscType::VCD:
|
||||
+ if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_vcd", NULL))
|
||||
mimeType = "media/vcd";
|
||||
- break;
|
||||
- case DiscType::SVCD:
|
||||
+ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_svcd", NULL))
|
||||
mimeType = "media/svcd";
|
||||
- break;
|
||||
- case DiscType::DVD:
|
||||
+ else if (libhal_device_get_property_bool(m_halContext, udi, "volume.disc.is_videodvd", NULL))
|
||||
mimeType = "media/dvdvideo";
|
||||
- break;
|
||||
- }
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1,30 +0,0 @@
|
||||
diff -Naur kdebase-3.5.10/kcontrol/crypto/crypto.cpp kdebase-3.5.10-y/kcontrol/crypto/crypto.cpp
|
||||
--- kdebase-3.5.10/kcontrol/crypto/crypto.cpp 2006-10-01 20:31:49.000000000 +0300
|
||||
+++ kdebase-3.5.10-y/kcontrol/crypto/crypto.cpp 2010-05-05 08:27:59.323611142 +0300
|
||||
@@ -2321,7 +2321,7 @@
|
||||
unsigned int i;
|
||||
SSL_CTX *ctx;
|
||||
SSL *ssl;
|
||||
-SSL_METHOD *meth;
|
||||
+SSL_METHOD const *meth;
|
||||
|
||||
SSLv2Box->clear();
|
||||
SSLv3Box->clear();
|
||||
@@ -2337,7 +2337,7 @@
|
||||
CipherItem *item;
|
||||
for (i=0; ; i++) {
|
||||
int j, k;
|
||||
- SSL_CIPHER *sc;
|
||||
+ SSL_CIPHER const *sc;
|
||||
sc = (meth->get_cipher)(i);
|
||||
if (!sc)
|
||||
break;
|
||||
@@ -2365,7 +2365,7 @@
|
||||
|
||||
for (i=0; ; i++) {
|
||||
int j, k;
|
||||
- SSL_CIPHER *sc;
|
||||
+ SSL_CIPHER const *sc;
|
||||
sc = (meth->get_cipher)(i);
|
||||
if (!sc)
|
||||
break;
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,28 +0,0 @@
|
||||
--- kdebase-3.3.2/kdm/kfrontend/themer/kdmthemer.cpp-- 2005-02-28 15:16:19.881739297 +0100
|
||||
+++ kdebase-3.3.2/kdm/kfrontend/themer/kdmthemer.cpp 2005-02-28 15:17:37.816468727 +0100
|
||||
@@ -57,11 +57,23 @@ KdmThemer::KdmThemer( const QString &_fi
|
||||
|
||||
// read the XML file and create DOM tree
|
||||
TQString filename = _filename;
|
||||
- if (!::access( TQFile::encodeName( filename + "/GdmGreeterTheme.desktop" ), R_OK )) {
|
||||
+ if ( _filename.startsWith("/usr/share/mdk/dm") )
|
||||
+ {
|
||||
+ if (!::access( TQFile::encodeName( filename + "/KdmGreeterTheme.desktop" ), R_OK )) {
|
||||
+ KSimpleConfig cfg( filename + "/KdmGreeterTheme.desktop" );
|
||||
+ cfg.setGroup( "GdmGreeterTheme" );
|
||||
+ filename += '/' + cfg.readEntry( "Greeter" );
|
||||
+ }
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ if (!::access( TQFile::encodeName( filename + "/GdmGreeterTheme.desktop" ), R_OK )) {
|
||||
KSimpleConfig cfg( filename + "/GdmGreeterTheme.desktop" );
|
||||
cfg.setGroup( "GdmGreeterTheme" );
|
||||
filename += '/' + cfg.readEntry( "Greeter" );
|
||||
- }
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
TQFile opmlFile( filename );
|
||||
if (!opmlFile.open( IO_ReadOnly )) {
|
||||
FDialog::box( widget(), errorbox, i18n( "Cannot open theme file %1" ).arg(filename) );
|
||||
@ -1,18 +0,0 @@
|
||||
--- kdebase-3.4.0/kcontrol/screensaver/scrnsave.cpp-- 2005-04-12 05:03:07.927420021 -0400
|
||||
+++ kdebase-3.4.0/kcontrol/screensaver/scrnsave.cpp 2005-04-12 05:04:27.259781143 -0400
|
||||
@@ -103,13 +103,14 @@ KScreenSaver::KScreenSaver(TQWidget *pare
|
||||
|
||||
// Add KDE specific screensaver path
|
||||
TQString relPath="System/ScreenSavers/";
|
||||
+#if 0 //disable because we mustn't use it
|
||||
KServiceGroup::Ptr servGroup = KServiceGroup::baseGroup( "screensavers" );
|
||||
if (servGroup)
|
||||
{
|
||||
relPath=servGroup->relPath();
|
||||
kdDebug() << "relPath=" << relPath << endl;
|
||||
}
|
||||
-
|
||||
+#endif
|
||||
KGlobal::dirs()->addResourceType("scrsav",
|
||||
KGlobal::dirs()->kde_default("apps") +
|
||||
relPath);
|
||||
@ -1,14 +0,0 @@
|
||||
--- kdebase-3.4.2/kdm/config.def-- 2005-09-08 15:28:23.000000000 +0200
|
||||
+++ kdebase-3.4.2/kdm/config.def 2005-09-08 15:28:49.000000000 +0200
|
||||
@@ -1348,9 +1348,9 @@ Description:
|
||||
|
||||
Key: ServerArgsLocal
|
||||
Type: string
|
||||
-Default: ""
|
||||
+Default: "-nolisten tcp"
|
||||
User: core
|
||||
-Instance: :*/"-nolisten tcp"
|
||||
+Instance: */"-deferglyphs 16 -nolisten tcp"
|
||||
Comment: &
|
||||
Description:
|
||||
Additional arguments for the &X-Server;s for local sessions.
|
||||
@ -1,20 +0,0 @@
|
||||
--- kdebase-3.4.2/kdm/kfrontend/kgapp.cpp-- 2005-09-07 20:13:23.000000000 +0200
|
||||
+++ kdebase-3.4.2/kdm/kfrontend/kgapp.cpp 2005-09-07 20:13:52.000000000 +0200
|
||||
@@ -140,7 +140,7 @@ kg_main( const char *argv0 )
|
||||
app.setFont( _normalFont );
|
||||
|
||||
setup_modifiers( dpy, _numLockStatus );
|
||||
- SecureDisplay( dpy );
|
||||
+ //SecureDisplay( dpy );
|
||||
KProcess *proc = 0;
|
||||
if (!_grabServer) {
|
||||
if (_useBackground) {
|
||||
@@ -226,7 +226,7 @@ kg_main( const char *argv0 )
|
||||
KGVerify::done();
|
||||
|
||||
delete proc;
|
||||
- UnsecureDisplay( dpy );
|
||||
+ //UnsecureDisplay( dpy );
|
||||
restore_modifiers();
|
||||
|
||||
XSetInputFocus( qt_xdisplay(), PointerRoot, PointerRoot, CurrentTime );
|
||||
@ -1,7 +0,0 @@
|
||||
#%PAM-1.0
|
||||
auth include system-auth
|
||||
account required pam_nologin.so
|
||||
account include system-auth
|
||||
password include system-auth
|
||||
session optional pam_console.so
|
||||
session include system-auth
|
||||
@ -1,8 +0,0 @@
|
||||
#%PAM-1.0
|
||||
auth sufficient pam_permit.so
|
||||
auth include system-auth
|
||||
account required pam_nologin.so
|
||||
account include system-auth
|
||||
password include system-auth
|
||||
session optional pam_console.so
|
||||
session include system-auth
|
||||
|
Before Width: | Height: | Size: 78 KiB |
@ -1,86 +0,0 @@
|
||||
--- kdesktop/lock/lockdlg.cc.fix_vibrate_dialog 2007-05-14 09:55:44.000000000 +0200
|
||||
+++ kdesktop/lock/lockdlg.cc 2009-01-04 06:20:33.000000000 +0100
|
||||
@@ -53,6 +53,7 @@
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/keysym.h>
|
||||
#include <fixx11h.h>
|
||||
+#include <kapplication.h>
|
||||
|
||||
#ifndef AF_LOCAL
|
||||
# define AF_LOCAL AF_UNIX
|
||||
@@ -202,6 +203,38 @@
|
||||
}
|
||||
}
|
||||
|
||||
+void PasswordDlg::movedialog( int _move )
|
||||
+{
|
||||
+ waitMoveDialog = true;
|
||||
+ this->move(pos().x()+_move, pos().y());
|
||||
+ TQTimer::singleShot( 50, this, SLOT(moveTimerDone()) );
|
||||
+ while (waitMoveDialog)
|
||||
+ kapp->processEvents();
|
||||
+}
|
||||
+
|
||||
+void PasswordDlg::moveTimerDone()
|
||||
+{
|
||||
+ waitMoveDialog = false;
|
||||
+}
|
||||
+
|
||||
+void PasswordDlg::badPasswordLogin()
|
||||
+{
|
||||
+ if ( mUnlockingFailed )
|
||||
+ {
|
||||
+ for ( int i = 0 ; i<2 ; i++)
|
||||
+ {
|
||||
+ movedialog( 10 );
|
||||
+ movedialog( -20 );
|
||||
+ movedialog( 20 );
|
||||
+ movedialog( -20 );
|
||||
+ movedialog( 20 );
|
||||
+ movedialog( -10 );
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
+
|
||||
+
|
||||
//---------------------------------------------------------------------------
|
||||
//
|
||||
// Handle timer events.
|
||||
@@ -332,6 +365,7 @@
|
||||
ok->setEnabled(false);
|
||||
cancel->setEnabled(false);
|
||||
mNewSessButton->setEnabled( false );
|
||||
+ badPasswordLogin();
|
||||
return;
|
||||
case AuthAbort:
|
||||
return;
|
||||
--- kdesktop/lock/lockdlg.h.fix_vibrate_dialog 2005-09-10 10:25:41.000000000 +0200
|
||||
+++ kdesktop/lock/lockdlg.h 2009-01-04 06:20:33.000000000 +0100
|
||||
@@ -55,7 +55,7 @@
|
||||
void slotOK();
|
||||
void layoutClicked();
|
||||
void slotActivity();
|
||||
-
|
||||
+ void moveTimerDone();
|
||||
private:
|
||||
void setLayoutText( const TQString &txt );
|
||||
void capsLocked();
|
||||
@@ -71,6 +71,9 @@
|
||||
void handleVerify();
|
||||
void reapVerify();
|
||||
void cantCheck();
|
||||
+ void movedialog( int _move );
|
||||
+ void badPasswordLogin();
|
||||
+
|
||||
GreeterPluginHandle *mPlugin;
|
||||
KGreeterPlugin *greet;
|
||||
TQFrame *frame;
|
||||
@@ -86,6 +89,7 @@
|
||||
TQStringList::iterator currLayout;
|
||||
int sPid, sFd;
|
||||
TQListView *lv;
|
||||
+ bool waitMoveDialog;
|
||||
};
|
||||
|
||||
#endif
|
||||
@ -1,42 +0,0 @@
|
||||
--- kcontrol/kcontrol/KControl.desktop 2011-07-20 12:08:11.913774590 +0100
|
||||
+++ kcontrol/kcontrol/KControl.desktop.new 2011-07-22 10:21:25.604284524 +0100
|
||||
@@ -1,3 +1,4 @@
|
||||
+
|
||||
[Desktop Entry]
|
||||
Exec=kcontrol -caption "%c" %i %m
|
||||
Icon=kcontrol
|
||||
@@ -5,7 +6,7 @@
|
||||
DocPath=kcontrol/index.html
|
||||
X-KDE-StartupNotify=true
|
||||
|
||||
-Name=KDE3 Control Center
|
||||
+Name=Trinity Control Center
|
||||
Name[af]=Beheer Sentrum
|
||||
Name[ar]=مركز التحكم
|
||||
Name[az]=İdarə Mərkəzi
|
||||
@@ -21,14 +22,14 @@
|
||||
Name[da]=Kontrolcenter
|
||||
Name[de]=Kontrollzentrum
|
||||
Name[el]=Κέντρο ελέγχου
|
||||
-Name[en_GB]=Control Centre
|
||||
+Name[en_GB]=Trinity Control Centre
|
||||
Name[eo]=Stircentro
|
||||
Name[es]=Centro de control
|
||||
Name[et]=Juhtimiskeskus
|
||||
Name[eu]=Kontrol gunea
|
||||
Name[fa]=مرکز کنترل
|
||||
Name[fi]=Ohjauskeskus
|
||||
-Name[fr]=Centre de configuration de KDE
|
||||
+Name[fr]=Centre de configuration de Trinity
|
||||
Name[fy]=Konfiguraasjesintrum
|
||||
Name[ga]=Lárionad Rialaithe
|
||||
Name[gl]=Centro de Control
|
||||
@@ -90,6 +91,6 @@
|
||||
Name[zu]=Indawo Yokulawula
|
||||
|
||||
X-DCOP-ServiceType=Unique
|
||||
-Categories=Qt;KDE;Core;System;
|
||||
+Categories=Qt;KDE;Core;System;X-MandrivaLinux-CrossDesktop;
|
||||
+X-Desktop-File-Install-Version=0.16
|
||||
OnlyShowIn=KDE;
|
||||
-NoDisplay=true
|
||||
@ -1,198 +0,0 @@
|
||||
--- kcontrol/kdm/kdm-users.cpp.nopatch 2011-07-19 11:06:21.493310808 +0100
|
||||
+++ kcontrol/kdm/kdm-users.cpp 2011-07-19 11:15:19.120311520 +0100
|
||||
@@ -56,7 +56,7 @@
|
||||
} else if (!stat( "/usr/portage", &st )) { /* gentoo */
|
||||
defminuid = "1000";
|
||||
defmaxuid = "65000";
|
||||
- } else if (!stat( "/etc/mandrake-release", &st )) { /* mandrake - check before redhat! */
|
||||
+ } else if (!stat( "/etc/mandriva-release", &st )) { /* mandrake - check before redhat! */
|
||||
defminuid = "500";
|
||||
defmaxuid = "65000";
|
||||
} else if (!stat( "/etc/redhat-release", &st )) { /* redhat */
|
||||
@@ -74,12 +74,8 @@
|
||||
// We assume that $kde_datadir/kdm exists, but better check for pics/ and pics/users,
|
||||
// and create them if necessary.
|
||||
config->setGroup( "X-*-Greeter" );
|
||||
- m_userPixDir = config->readEntry( "FaceDir", KGlobal::dirs()->resourceDirs("data").last() + "kdm/faces" ) + '/';
|
||||
+ m_pixDir = "/usr/share/faces/";
|
||||
m_notFirst = false;
|
||||
- TQDir testDir( m_userPixDir );
|
||||
- if ( !testDir.exists() && !testDir.mkdir( testDir.absPath() ) && !geteuid() )
|
||||
- KMessageBox::sorry( this, i18n("Unable to create folder %1").arg( testDir.absPath() ) );
|
||||
- chmod( TQFile::encodeName( m_userPixDir ), 0755 );
|
||||
|
||||
m_defaultText = i18n("<default>");
|
||||
|
||||
@@ -146,18 +142,6 @@
|
||||
connect( optoutlv, TQT_SIGNAL(clicked( TQListViewItem * )),
|
||||
TQT_SLOT(slotChanged()) );
|
||||
|
||||
- faceGroup = new TQButtonGroup( 5, Qt::Vertical, i18n("User Image Source"), this );
|
||||
- TQWhatsThis::add( faceGroup, i18n("Here you can specify where KDM will obtain the images that represent users."
|
||||
- " \"Admin\" represents the global folder; these are the pictures you can set below."
|
||||
- " \"User\" means that KDM should read the user's $HOME/.face.icon file."
|
||||
- " The two selections in the middle define the order of preference if both sources are available.") );
|
||||
- connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotFaceOpts()) );
|
||||
- connect( faceGroup, TQT_SIGNAL(clicked( int )), TQT_SLOT(slotChanged()) );
|
||||
- rbadmonly = new TQRadioButton( i18n("Admin"), faceGroup );
|
||||
- rbprefadm = new TQRadioButton( i18n("Admin, user"), faceGroup );
|
||||
- rbprefusr = new TQRadioButton( i18n("User, admin"), faceGroup );
|
||||
- rbusronly = new TQRadioButton( i18n("User"), faceGroup );
|
||||
-
|
||||
TQGroupBox *picGroup = new TQVGroupBox( i18n("User Images"), this );
|
||||
TQWidget *hlpw = new TQWidget( picGroup );
|
||||
usercombo = new KComboBox( hlpw );
|
||||
@@ -191,6 +175,7 @@
|
||||
TQVBoxLayout *lLayout = new TQVBoxLayout( main, 10 );
|
||||
lLayout->addWidget( minGroup );
|
||||
lLayout->addWidget( usrGroup );
|
||||
+ lLayout->addWidget( picGroup );
|
||||
lLayout->addStretch( 1 );
|
||||
|
||||
TQVBoxLayout *mLayout = new TQVBoxLayout( main, 10 );
|
||||
@@ -199,11 +184,6 @@
|
||||
mLayout->setStretchFactor( wstack, 1 );
|
||||
main->setStretchFactor( mLayout, 1 );
|
||||
|
||||
- TQVBoxLayout *rLayout = new TQVBoxLayout( main, 10 );
|
||||
- rLayout->addWidget( faceGroup );
|
||||
- rLayout->addWidget( picGroup );
|
||||
- rLayout->addStretch( 1 );
|
||||
-
|
||||
}
|
||||
|
||||
void KDMUsersWidget::makeReadOnly()
|
||||
@@ -214,10 +194,6 @@
|
||||
cbcomplete->setEnabled(false);
|
||||
cbinverted->setEnabled(false);
|
||||
cbusrsrt->setEnabled(false);
|
||||
- rbadmonly->setEnabled(false);
|
||||
- rbprefadm->setEnabled(false);
|
||||
- rbprefusr->setEnabled(false);
|
||||
- rbusronly->setEnabled(false);
|
||||
wstack->setEnabled(false);
|
||||
disconnect( userbutton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotUserButtonClicked()) );
|
||||
userbutton->setAcceptDrops(false);
|
||||
@@ -232,7 +208,6 @@
|
||||
wstack->setEnabled( en );
|
||||
wstack->raiseWidget( cbinverted->isChecked() ? optoutlv : optinlv );
|
||||
en = cbshowlist->isChecked();
|
||||
- faceGroup->setEnabled( en );
|
||||
if (!en) {
|
||||
usercombo->setEnabled( false );
|
||||
userbutton->setEnabled( false );
|
||||
@@ -243,12 +218,6 @@
|
||||
|
||||
void KDMUsersWidget::slotFaceOpts()
|
||||
{
|
||||
- bool en = !rbusronly->isChecked();
|
||||
- usercombo->setEnabled( en );
|
||||
- userbutton->setEnabled( en );
|
||||
- if (en)
|
||||
- slotUserSelected();
|
||||
- else
|
||||
rstuserbutton->setEnabled( false );
|
||||
}
|
||||
|
||||
@@ -257,13 +226,13 @@
|
||||
TQString user = usercombo->currentText();
|
||||
TQImage p;
|
||||
if (user != m_defaultText &&
|
||||
- p.load( m_userPixDir + user + ".face.icon" )) {
|
||||
+ p.load( m_pixDir + user + ".png" )) {
|
||||
rstuserbutton->setEnabled( !getuid() );
|
||||
} else {
|
||||
- p.load( m_userPixDir + ".default.face.icon" );
|
||||
+ p.load( m_pixDir + "default.png" );
|
||||
rstuserbutton->setEnabled( false );
|
||||
}
|
||||
- userbutton->setPixmap( p.smoothScale( 48, 48, TQImage::ScaleMin ) );
|
||||
+ userbutton->setPixmap( p );
|
||||
}
|
||||
|
||||
|
||||
@@ -272,7 +241,7 @@
|
||||
TQString user( usercombo->currentText() );
|
||||
if (user == m_defaultText)
|
||||
{
|
||||
- user = ".default";
|
||||
+ user = "default";
|
||||
if (KMessageBox::questionYesNo(this, i18n("Save image as default image?"),TQString::null,KStdGuiItem::save(),KStdGuiItem::cancel())
|
||||
!= KMessageBox::Yes)
|
||||
return;
|
||||
@@ -286,8 +255,7 @@
|
||||
return;
|
||||
}
|
||||
|
||||
- p = p.smoothScale( 48, 48, TQImage::ScaleMin );
|
||||
- TQString userpix = m_userPixDir + user + ".face.icon";
|
||||
+ TQString userpix = m_pixDir + user + ".png";
|
||||
if (!p.save( userpix, "PNG" ))
|
||||
KMessageBox::sorry(this,
|
||||
i18n("There was an error saving the image:\n%1")
|
||||
@@ -319,7 +287,7 @@
|
||||
|
||||
void KDMUsersWidget::slotUnsetUserPix()
|
||||
{
|
||||
- TQFile::remove( m_userPixDir + usercombo->currentText() + ".face.icon" );
|
||||
+ TQFile::remove( m_pixDir + usercombo->currentText() + ".png" );
|
||||
slotUserSelected();
|
||||
}
|
||||
|
||||
@@ -368,11 +336,6 @@
|
||||
|
||||
config->writeEntry( "HiddenUsers", hiddenUsers );
|
||||
config->writeEntry( "SelectedUsers", selectedUsers );
|
||||
-
|
||||
- config->writeEntry( "FaceSource",
|
||||
- rbadmonly->isChecked() ? "AdminOnly" :
|
||||
- rbprefadm->isChecked() ? "PreferAdmin" :
|
||||
- rbprefusr->isChecked() ? "PreferUser" : "UserOnly" );
|
||||
}
|
||||
|
||||
|
||||
@@ -456,16 +419,6 @@
|
||||
cbinverted->setChecked( config->readEntry( "ShowUsers" ) != "Selected" );
|
||||
cbusrsrt->setChecked(config->readBoolEntry("SortUsers", true));
|
||||
|
||||
- TQString ps = config->readEntry( "FaceSource" );
|
||||
- if (ps == TQString::fromLatin1("UserOnly"))
|
||||
- rbusronly->setChecked(true);
|
||||
- else if (ps == TQString::fromLatin1("PreferUser"))
|
||||
- rbprefusr->setChecked(true);
|
||||
- else if (ps == TQString::fromLatin1("PreferAdmin"))
|
||||
- rbprefadm->setChecked(true);
|
||||
- else
|
||||
- rbadmonly->setChecked(true);
|
||||
-
|
||||
slotUserSelected();
|
||||
|
||||
slotShowOpts();
|
||||
@@ -480,7 +433,6 @@
|
||||
cbcomplete->setChecked( false );
|
||||
cbinverted->setChecked( true );
|
||||
cbusrsrt->setChecked( true );
|
||||
- rbadmonly->setChecked( true );
|
||||
hiddenUsers.clear();
|
||||
selectedUsers.clear();
|
||||
slotShowOpts();
|
||||
diff -u -r kdebase-kdm/kcontrol/kdm/kdm-users.h kdebase-3.5.9/kcontrol/kdm/kdm-users.h
|
||||
--- kcontrol/kdm/kdm-users.h 2005-10-10 12:03:49.000000000 -0300
|
||||
+++ kcontrol/kdm/kdm-users.h 2008-03-06 19:04:12.000000000 -0300
|
||||
@@ -86,14 +86,11 @@
|
||||
QWidgetStack *wstack;
|
||||
KListView *optoutlv, *optinlv;
|
||||
|
||||
- QButtonGroup *faceGroup; // right
|
||||
- QRadioButton *rbadmonly, *rbprefadm, *rbprefusr, *rbusronly;
|
||||
-
|
||||
KComboBox *usercombo; // right below
|
||||
QPushButton *userbutton;
|
||||
QPushButton *rstuserbutton;
|
||||
|
||||
- QString m_userPixDir;
|
||||
+ QString m_pixDir;
|
||||
QString m_defaultText;
|
||||
QStringList hiddenUsers, selectedUsers;
|
||||
QString defminuid, defmaxuid;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,22 +0,0 @@
|
||||
--- startkde.orig 2011-07-19 11:58:41.267311384 +0100
|
||||
+++ startkde 2011-07-19 12:02:56.119311786 +0100
|
||||
@@ -16,6 +16,11 @@
|
||||
exit 1
|
||||
fi
|
||||
|
||||
+if [ "$MDV_MENU_STYLE" = "mandriva" ]; then
|
||||
+ XDG_MENU_PREFIX=kde-
|
||||
+ export XDG_MENU_PREFIX=kde-
|
||||
+fi
|
||||
+
|
||||
# Set the background color.
|
||||
# The standard X background is nasty, causing moire effects and exploding
|
||||
# people's heads. We use colours from the standard KDE palette for those with
|
||||
@@ -163,6 +168,7 @@
|
||||
# Allow interested applications, such as the Plasma control wrapper,
|
||||
# to know that this is a Trinity desktop and not a KDE one.
|
||||
export DESKTOP_SESSION=kde3
|
||||
+export DESKTOP="kde"
|
||||
|
||||
# Please see kstartupconfig source for usage.
|
||||
mkdir -m 700 -p $kdehome
|
||||
@ -1,11 +0,0 @@
|
||||
--- kdebase-3.5.6/kioslave/media/mediamanager/halbackend.cpp-- 2007-02-05 09:05:15.000000000 +0100
|
||||
+++ kdebase-3.5.6/kioslave/media/mediamanager/halbackend.cpp 2007-02-05 09:05:22.000000000 +0100
|
||||
@@ -1008,7 +1008,7 @@
|
||||
TQString HALBackend::listUsingProcesses(const Medium* medium)
|
||||
{
|
||||
TQString proclist, fullmsg;
|
||||
- TQString cmdline = TQString("/usr/bin/env fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
|
||||
+ TQString cmdline = TQString("/usr/bin/env /sbin/fuser -vm %1 2>&1").arg(KProcess::quote(medium->mountPoint()));
|
||||
FILE *fuser = popen(cmdline.latin1(), "r");
|
||||
|
||||
uint counter = 0;
|
||||
@ -1,34 +0,0 @@
|
||||
--- kdebase-3.5.3/kdesktop/desktop.cc.orig 2006-06-22 21:14:19.000000000 -0300
|
||||
+++ kdebase-3.5.3/kdesktop/desktop.cc 2006-07-12 15:10:12.000000000 -0300
|
||||
@@ -861,6 +861,11 @@
|
||||
KApplication::ShutdownTypeNone );
|
||||
}
|
||||
|
||||
+void KDesktop::logoutWithoutConfirmation()
|
||||
+{
|
||||
+ slotLogoutNoCnf();
|
||||
+}
|
||||
+
|
||||
void KDesktop::logout( KApplication::ShutdownConfirm confirm,
|
||||
KApplication::ShutdownType sdtype )
|
||||
{
|
||||
--- kdebase-3.5.3/kdesktop/desktop.h.orig 2006-04-27 15:06:09.000000000 -0300
|
||||
+++ kdebase-3.5.3/kdesktop/desktop.h 2006-07-12 15:11:14.000000000 -0300
|
||||
@@ -84,6 +84,7 @@
|
||||
virtual void logout();
|
||||
virtual void clearCommandHistory();
|
||||
virtual void runAutoStart();
|
||||
+ virtual void logoutWithoutConfirmation();
|
||||
|
||||
virtual void switchDesktops( int delta );
|
||||
|
||||
--- kdebase-3.5.3/kdesktop/KDesktopIface.h.orig 2006-04-27 15:06:09.000000000 -0300
|
||||
+++ kdebase-3.5.3/kdesktop/KDesktopIface.h 2006-07-12 15:10:12.000000000 -0300
|
||||
@@ -75,6 +75,7 @@
|
||||
* Bye bye
|
||||
*/
|
||||
virtual void logout() = 0;
|
||||
+ virtual void logoutWithoutConfirmation() = 0;
|
||||
/**
|
||||
* Returns whether KDesktop uses a virtual root.
|
||||
*/
|
||||
@ -1,24 +0,0 @@
|
||||
--- kdebase-3.5.4/kcontrol/krdb/krdb.cpp-- 2006-09-14 08:38:52.000000000 +0200
|
||||
+++ kdebase-3.5.4/kcontrol/krdb/krdb.cpp 2006-09-14 08:48:18.000000000 +0200
|
||||
@@ -75,13 +75,20 @@
|
||||
// -----------------------------------------------------------------------------
|
||||
static void applyGtkStyles(bool active, int version)
|
||||
{
|
||||
+ TQString userFile = TQDir::homeDirPath()+userGtkrc(version);
|
||||
+ KConfig kglobalsStyle("kdeglobals", true, false);
|
||||
+ kglobalsStyle.setGroup("General");
|
||||
+ TQString styleName = kglobalsStyle.readEntry("widgetStyle");
|
||||
+ if(!TQDir(userFile).exists() && styleName =="ia_ora")
|
||||
+ return;
|
||||
+
|
||||
TQString gtkkde = locateLocal("config", 2==version?"gtkrc-2.0":"gtkrc");
|
||||
TQCString gtkrc = getenv(gtkEnvVar(version));
|
||||
TQStringList list = TQStringList::split(':', TQFile::decodeName(gtkrc));
|
||||
if (list.count() == 0)
|
||||
{
|
||||
list.append(TQString::fromLatin1(sysGtkrc(version)));
|
||||
- list.append(TQDir::homeDirPath()+userGtkrc(version));
|
||||
+ list.append(userFile);
|
||||
}
|
||||
list.remove(gtkkde);
|
||||
list.append(gtkkde);
|
||||
@ -1,15 +0,0 @@
|
||||
--- kdebase-3.5.7/kicker/applets/clock/clock.cpp.orig 2007-09-04 01:18:10.000000000 -0300
|
||||
+++ kdebase-3.5.7/kicker/applets/clock/clock.cpp 2007-09-04 01:19:41.000000000 -0300
|
||||
@@ -1464,11 +1464,7 @@
|
||||
preferences();
|
||||
break;
|
||||
case 103:
|
||||
- proc << locate("exe", "kdesu");
|
||||
- proc << "--nonewdcop";
|
||||
- proc << TQString("%1 kde-clock.desktop --lang %2")
|
||||
- .arg(locate("exe", "kcmshell"))
|
||||
- .arg(KGlobal::locale()->language());
|
||||
+ proc << locate("exe", "drakclock");
|
||||
proc.start(KProcess::DontCare);
|
||||
break;
|
||||
case 104:
|
||||
@ -1,27 +0,0 @@
|
||||
--- kdebase-3.5.7/kdesktop/init.cc.kdesktop_firstrun 2007-09-26 10:15:58.000000000 -0300
|
||||
+++ kdebase-3.5.7/kdesktop/init.cc 2007-09-26 09:32:43.000000000 -0300
|
||||
@@ -87,7 +87,9 @@ static bool testDir( const TQString &_nam
|
||||
else // exists already
|
||||
{
|
||||
closedir( dp );
|
||||
- return false;
|
||||
+ KConfig cfg("kdesktoprc");
|
||||
+ cfg.setGroup("General");
|
||||
+ return cfg.readBoolEntry("FirstRun", true);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -202,7 +204,12 @@ void testLocalInstallation()
|
||||
copyDirectoryFile("directory.autostart", KGlobalSettings::autostartPath(), newRelease);
|
||||
|
||||
if (emptyDesktop)
|
||||
- copyDesktopLinks();
|
||||
+ {
|
||||
+ copyDesktopLinks();
|
||||
+ KConfig cfg("kdesktoprc");
|
||||
+ cfg.setGroup("General");
|
||||
+ cfg.writeEntry("FirstRun", false);
|
||||
+ }
|
||||
|
||||
// Take care of creating or updating trash.desktop
|
||||
const TQString trashDir = KGlobal::dirs()->localxdgdatadir() + "Trash";
|
||||
@ -1,11 +0,0 @@
|
||||
--- kdebase-3.5.12/khelpcenter/searchhandlers/khc_htsearch.pl.orig 2011-02-04 15:29:41.658473919 +0000
|
||||
+++ kdebase-3.5.12/khelpcenter/searchhandlers/khc_htsearch.pl 2011-02-04 15:29:57.738474105 +0000
|
||||
@@ -8,7 +8,7 @@
|
||||
use open IO => ':utf8';
|
||||
use open ':std';
|
||||
|
||||
-my $htsearchpath="/usr/lib/cgi-bin/htsearch";
|
||||
+my $htsearchpath="/usr/bin/htsearch";
|
||||
|
||||
my $config;
|
||||
my $format;
|
||||
@ -1,180 +0,0 @@
|
||||
diff -purN kdebase-3.5.7.orig/doc/kioslave/index.docbook kdebase-3.5.7/doc/kioslave/index.docbook
|
||||
--- kdebase-3.5.7.orig/doc/kioslave/index.docbook 2007-09-13 18:41:54.000000000 +0200
|
||||
+++ kdebase-3.5.7/doc/kioslave/index.docbook 2007-09-13 18:46:13.000000000 +0200
|
||||
@@ -20,6 +20,7 @@
|
||||
<!ENTITY kio-info SYSTEM "info.docbook">
|
||||
<!ENTITY kio-lan SYSTEM "lan.docbook">
|
||||
<!ENTITY kio-ldap SYSTEM "ldap.docbook">
|
||||
+<!ENTITY kio-lzma SYSTEM "lzma.docbook">
|
||||
<!ENTITY kio-mailto SYSTEM "mailto.docbook">
|
||||
<!ENTITY kio-mac SYSTEM "mac.docbook">
|
||||
<!ENTITY kio-man SYSTEM "man.docbook">
|
||||
@@ -68,6 +69,7 @@
|
||||
&kio-info;
|
||||
&kio-lan;
|
||||
&kio-ldap;
|
||||
+&kio-lzma;
|
||||
&kio-mailto;
|
||||
&kio-mac;
|
||||
&kio-man;
|
||||
diff -purN kdebase-3.5.7.orig/doc/kioslave/lzma.docbook kdebase-3.5.7/doc/kioslave/lzma.docbook
|
||||
--- kdebase-3.5.7.orig/doc/kioslave/lzma.docbook 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ kdebase-3.5.7/doc/kioslave/lzma.docbook 2007-09-13 18:46:13.000000000 +0200
|
||||
@@ -0,0 +1,30 @@
|
||||
+<article lang="&language;" id="lzma">
|
||||
+<title>lzma</title>
|
||||
+<articleinfo>
|
||||
+<authorgroup>
|
||||
+<author>&Lauri.Watts; &Lauri.Watts.mail;</author>
|
||||
+<!-- TRANS:ROLES_OF_TRANSLATORS -->
|
||||
+</authorgroup>
|
||||
+</articleinfo>
|
||||
+
|
||||
+<para><command>lzma</command> is a compression program</para>
|
||||
+
|
||||
+<para>The lzma kioslave is not directly usable, and is intended for use
|
||||
+as a filter. For example, the tar kioslave can filter a file through
|
||||
+the lzma kioslave, in order to display the contents of a <literal
|
||||
+role="extension">tar.lzma</literal> file directly in a &konqueror;
|
||||
+window.</para>
|
||||
+
|
||||
+<para>If you click on a file compressed with a <literal
|
||||
+role="extension">lzma</literal> extension in &konqueror;, this kioslave is
|
||||
+used to uncompress it and display it as a normal (uncompressed)
|
||||
+file.</para>
|
||||
+
|
||||
+<para>If you are a developer, and would like to use the lzma filter, you
|
||||
+can find documentation on using kioslaves at <ulink
|
||||
+url="http://developer.kde.org">http://developer.kde.org</ulink></para>
|
||||
+
|
||||
+<para> See the manual: <ulink url="man:/lzma">lzma</ulink>.
|
||||
+</para>
|
||||
+
|
||||
+</article>
|
||||
diff -purN kdebase-3.5.7.orig/kioslave/filter/lzma.protocol kdebase-3.5.7/kioslave/filter/lzma.protocol
|
||||
--- kdebase-3.5.7.orig/kioslave/filter/lzma.protocol 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ kdebase-3.5.7/kioslave/filter/lzma.protocol 2007-09-13 18:46:13.000000000 +0200
|
||||
@@ -0,0 +1,10 @@
|
||||
+[Protocol]
|
||||
+exec=kio_filter
|
||||
+protocol=lzma
|
||||
+mimetype=application/lzma
|
||||
+input=stream
|
||||
+output=stream
|
||||
+reading=true
|
||||
+source=false
|
||||
+DocPath=kioslave/lzma.html
|
||||
+Icon=ark
|
||||
diff -purN kdebase-3.5.7.orig/kioslave/filter/Makefile.am kdebase-3.5.7/kioslave/filter/Makefile.am
|
||||
--- kdebase-3.5.7.orig/kioslave/filter/Makefile.am 2007-09-13 18:41:35.000000000 +0200
|
||||
+++ kdebase-3.5.7/kioslave/filter/Makefile.am 2007-09-13 18:47:03.000000000 +0200
|
||||
@@ -17,5 +17,5 @@ if include_BZIP2
|
||||
BZIP2FILES=bzip.protocol bzip2.protocol
|
||||
endif
|
||||
|
||||
-protocol_DATA = gzip.protocol $(BZIP2FILES)
|
||||
+protocol_DATA = gzip.protocol $(BZIP2FILES) lzma.protocol
|
||||
|
||||
diff -purN kdebase-3.5.7.orig/kioslave/info/kde-info2html kdebase-3.5.7/kioslave/info/kde-info2html
|
||||
--- kdebase-3.5.7.orig/kioslave/info/kde-info2html 2007-09-13 18:41:35.000000000 +0200
|
||||
+++ kdebase-3.5.7/kioslave/info/kde-info2html 2007-09-13 18:46:13.000000000 +0200
|
||||
@@ -39,6 +39,8 @@
|
||||
# March 9 2003 Add support for browsing by file. by Luis Pedro Coelho
|
||||
# June 11 2003 Update the layout of the sides to the new infopageslayout.
|
||||
# by Sven Leiber <s.leiber@web.de>
|
||||
+# August 30 2007 Add lzma support.
|
||||
+# by Per Øyvind Karlsen <peroyvind@mandriva.org>
|
||||
#
|
||||
#-------------------------------------------------------
|
||||
|
||||
@@ -143,6 +145,9 @@ sub FileNotFound {
|
||||
elsif ($DirFileName =~ m/.info.gz$/ ) {
|
||||
open DIR, "-|", "gzip", "-dc", $DirFileName;
|
||||
}
|
||||
+ elsif ($DirFileName =~ m/.info.lzma$/ ) {
|
||||
+ open DIR, "-|", "lzma", "-dc", $DirFileName;
|
||||
+ }
|
||||
else {
|
||||
open DIR, $DirFileName;
|
||||
}
|
||||
@@ -252,6 +257,9 @@ sub infocat {
|
||||
elsif ($infofile =~ m/.info.gz$/ ) {
|
||||
open INFOFILE, "-|", "gzip", "-dc", "$dir/$infofile";
|
||||
}
|
||||
+ elsif ($infofile =~ m/.info.lzma$/ ) {
|
||||
+ open INFOFILE, "-|", "lzma", "-dc", "$dir/$infofile";
|
||||
+ }
|
||||
elsif ($infofile =~ m/.info$/) {
|
||||
open INFOFILE, "-|", "$dir/$infofile";
|
||||
}
|
||||
@@ -427,6 +435,9 @@ sub ReadIndirectTable {
|
||||
open FH1, "-|", "gunzip", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
|
||||
} elsif ($FileName =~ /\.bz2$/) {
|
||||
open FH1, "-|", "bunzip2", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
|
||||
+ } elsif ($FileName =~ /\.lzma$/) {
|
||||
+ open FH1, "-|", "unlzma", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
|
||||
+
|
||||
} else {
|
||||
open(FH1, $FileName) || &DieFileNotFound($FileName);
|
||||
}
|
||||
@@ -473,6 +484,8 @@ sub ReadTagTable {
|
||||
open FH, "-|", "gunzip", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
|
||||
} elsif ($FileName =~ /\.bz2$/) {
|
||||
open FH, "-|", "bunzip2", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
|
||||
+ } elsif ($FileName =~ /\.lzma$/) {
|
||||
+ open FH, "-|", "unlzma", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
|
||||
} else {
|
||||
open FH, $FileName || &DieFileNotFound($FileName);
|
||||
}
|
||||
@@ -756,6 +769,8 @@ sub InfoNode2HTML {
|
||||
open FH2, "-|", "gunzip", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
|
||||
} elsif ($FileName =~ /\.bz2$/) {
|
||||
open FH2, "-|", "bunzip2", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
|
||||
+ } elsif ($FileName =~ /\.lzma$/) {
|
||||
+ open FH2, "-|", "unlzma", "-q", "-d", "-c", $FileName || &DieFileNotFound($FileName);
|
||||
} else {
|
||||
open FH2, $FileName || &DieFileNotFound($FileName);
|
||||
}
|
||||
@@ -985,17 +1000,21 @@ sub FindFile {
|
||||
foreach my $Name ($File, $Alt) {
|
||||
my $gzName = $Name . '.gz';
|
||||
my $bz2Name = $Name . '.bz2';
|
||||
+ my $lzmaName = $Name . '.lzma';
|
||||
|
||||
foreach (@info2html::config::INFODIR) {
|
||||
return "$_/$Name" if -e "$_/$Name";
|
||||
return "$_/$gzName" if -e "$_/$gzName";
|
||||
return "$_/$bz2Name" if -e "$_/$bz2Name";
|
||||
+ return "$_/$lzmaName" if -e "$_/$lzmaName";
|
||||
+
|
||||
}
|
||||
next unless $ENV{INFOPATH};
|
||||
foreach my $i (split(/:/, $ENV{INFOPATH})) {
|
||||
return "$i/$Name" if -e "$i/$Name";
|
||||
return "$i/$gzName" if -e "$i/$gzName";
|
||||
return "$i/$bz2Name" if -e "$i/$bz2Name";
|
||||
+ return "$i/$lzmaName" if -e "$i/$lzmaName";
|
||||
}
|
||||
}
|
||||
return "";
|
||||
diff -purN kdebase-3.5.7.orig/kioslave/man/kio_man.cpp kdebase-3.5.7/kioslave/man/kio_man.cpp
|
||||
--- kdebase-3.5.7.orig/kioslave/man/kio_man.cpp 2007-09-13 18:41:35.000000000 +0200
|
||||
+++ kdebase-3.5.7/kioslave/man/kio_man.cpp 2007-09-13 18:46:13.000000000 +0200
|
||||
@@ -68,6 +68,8 @@ void stripExtension( QString *name )
|
||||
pos -= 4;
|
||||
else if ( name->find(".bz", -3) != -1 )
|
||||
pos -= 3;
|
||||
+ else if ( name->find(".lzma", -5) != -1 )
|
||||
+ pos -= 5;
|
||||
|
||||
if ( pos > 0 )
|
||||
pos = name->findRev('.', pos-1);
|
||||
@@ -1311,6 +1313,8 @@ void MANProtocol::showIndex(const QStrin
|
||||
end -= 2;
|
||||
else if ( len >= 4 && strcmp( end-3, ".bz2" ) == 0 )
|
||||
end -= 4;
|
||||
+ else if ( len >= 5 && strcmp( end-4, ".lzma" ) == 0 )
|
||||
+ end -= 5;
|
||||
|
||||
while ( end >= begin && *end != '.' )
|
||||
end--;
|
||||
@ -1,26 +0,0 @@
|
||||
--- kdebase-3.5.7/kdm/kfrontend/kdm_greet.c.fixlang 2007-10-02 16:56:25.000000000 -0300
|
||||
+++ kdebase-3.5.7/kdm/kfrontend/kdm_greet.c 2007-10-02 15:07:58.000000000 -0300
|
||||
@@ -779,7 +779,10 @@ main( int argc ATTR_UNUSED, char **argv
|
||||
LogPanic( "Cannot save $HOME\n" );
|
||||
atexit( cleanup );
|
||||
|
||||
- setenv( "LC_ALL", _language, 1 );
|
||||
+ if ( getenv( "LANG" ) == NULL )
|
||||
+ setenv( "LC_ALL", _language, 1 );
|
||||
+ else
|
||||
+ setenv( "LC_ALL", getenv( "LANG" ), 1 );
|
||||
|
||||
kg_main( argv[0] );
|
||||
|
||||
--- kdebase-3.5.7/kdm/backend/session.c.fixlang 2007-10-02 16:56:58.000000000 -0300
|
||||
+++ kdebase-3.5.7/kdm/backend/session.c 2007-10-02 16:18:21.000000000 -0300
|
||||
@@ -802,6 +802,9 @@ systemEnv( const char *user )
|
||||
env = baseEnv( user );
|
||||
if (td->authFile)
|
||||
env = setEnv( env, "XAUTHORITY", td->authFile );
|
||||
+ char *lang = getenv("LANG");
|
||||
+ if (lang != NULL)
|
||||
+ env = setEnv( env, "LANG", lang );
|
||||
env = setEnv( env, "PATH", td->systemPath );
|
||||
env = setEnv( env, "SHELL", td->systemShell );
|
||||
return env;
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
|
||||
<fontconfig>
|
||||
<!-- Font directory list -->
|
||||
<dir>/opt/kde3/share/apps/konsole/fonts</dir>
|
||||
</fontconfig>
|
||||
@ -1,11 +0,0 @@
|
||||
--- kdebase-3.5.4/kscreensaver.pamd-- 2006-08-02 09:20:53.000000000 +0200
|
||||
+++ kdebase-3.5.4/kscreensaver.pamd 2006-08-02 09:21:36.000000000 +0200
|
||||
@@ -1,4 +1,5 @@
|
||||
#%PAM-1.0
|
||||
-auth sufficient /lib/security/pam_linux_afs.so ignore_root
|
||||
-#auth sufficient /lib/security/pam_linux_afs.so no_unlog ignore_root
|
||||
-auth required /lib/security/pam_pwdb.so shadow nullok
|
||||
+#auth sufficient pam_linux_afs.so ignore_root
|
||||
+#auth sufficient pam_linux_afs.so no_unlog ignore_root
|
||||
+#auth required pam_pwdb.so shadow nullok
|
||||
+auth include system-auth
|
||||
@ -1,14 +0,0 @@
|
||||
--- kcontrol/componentchooser/componentchooser.cpp.nopatch 2011-07-19 13:15:03.679312055 +0100
|
||||
+++ kcontrol/componentchooser/componentchooser.cpp 2011-07-19 13:15:55.218311443 +0100
|
||||
@@ -367,10 +367,7 @@
|
||||
KURL::List urlList;
|
||||
KOpenWithDlg dlg(urlList, i18n("Select preferred Web browser application:"), TQString::null, this);
|
||||
if (dlg.exec() != TQDialog::Accepted) return;
|
||||
- m_browserService = dlg.service();
|
||||
- if (m_browserService)
|
||||
- m_browserExec = m_browserService->desktopEntryName();
|
||||
- else
|
||||
+
|
||||
m_browserExec = dlg.text();
|
||||
|
||||
lineExec->setText(m_browserExec);
|
||||
@ -1,11 +0,0 @@
|
||||
--- ./kicker/kicker/ui/k_mnu.cpp~ 2007-05-14 09:55:40.000000000 +0200
|
||||
+++ ./kicker/kicker/ui/k_mnu.cpp 2007-09-28 07:41:27.000000000 +0200
|
||||
@@ -361,7 +361,7 @@
|
||||
if (kapp->authorize("start_new_session") && (p = dm.numReserve()) >= 0)
|
||||
{
|
||||
if (kapp->authorize("lock_screen"))
|
||||
- sessionsMenu->insertItem(/*SmallIconSet("lockfork"),*/ i18n("Lock Current && Start New Session"), 100 );
|
||||
+ sessionsMenu->insertItem(SmallIconSet("switchuser"), i18n("Lock Current && Start New Session"), 100 );
|
||||
sessionsMenu->insertItem(SmallIconSet("fork"), i18n("Start New Session"), 101 );
|
||||
if (!p) {
|
||||
sessionsMenu->setItemEnabled( 100, false );
|
||||
@ -1,11 +0,0 @@
|
||||
--- kdebase-3.5.10/kcontrol/kcontrol/KControl.desktop 2008-08-19 14:16:46.000000000 -0400
|
||||
+++ kdebase-3.5.10/kcontrol/kcontrol/KControl.desktop.new 2008-08-26 12:30:06.000000000 -0400
|
||||
@@ -5,7 +5,7 @@
|
||||
DocPath=kcontrol/index.html
|
||||
X-KDE-StartupNotify=true
|
||||
|
||||
-Name=Control Center
|
||||
+Name=KDE3 Control Center
|
||||
Name[af]=Beheer Sentrum
|
||||
Name[ar]=مركز التحكم
|
||||
Name[az]=İdarə Mərkəzi
|
||||
@ -1,27 +0,0 @@
|
||||
--- kdebase-3.5.9/libkonq/konqbookmarkmanager.h.orig 2008-03-07 14:56:36.000000000 -0300
|
||||
+++ kdebase-3.5.9/libkonq/konqbookmarkmanager.h 2008-03-07 16:36:04.000000000 -0300
|
||||
@@ -3,6 +3,8 @@
|
||||
|
||||
#include <kbookmarkmanager.h>
|
||||
#include <kstandarddirs.h>
|
||||
+#include <kurl.h>
|
||||
+#include <kio/job.h>
|
||||
#include <libkonq_export.h>
|
||||
|
||||
class LIBKONQ_EXPORT KonqBookmarkManager
|
||||
@@ -11,7 +13,14 @@
|
||||
static KBookmarkManager * self() {
|
||||
if ( !s_bookmarkManager )
|
||||
{
|
||||
- TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml"));
|
||||
+ TQString globalBookmarkFile = locate( "data", TQString::fromLatin1( "konqueror/bookmarks.xml" ) );
|
||||
+ TQString bookmarksFile = locateLocal("data", TQString::fromLatin1("konqueror/bookmarks.xml"), true);
|
||||
+ if ( globalBookmarkFile != TQString::null && bookmarksFile == TQString::null )
|
||||
+ KIO::file_copy(
|
||||
+ KURL::fromPathOrURL( globalBookmarkFile ),
|
||||
+ KURL::fromPathOrURL( bookmarksFile ), -1, false, false
|
||||
+ );
|
||||
+
|
||||
s_bookmarkManager = KBookmarkManager::managerForFile( bookmarksFile );
|
||||
}
|
||||
return s_bookmarkManager;
|
||||
@ -1,30 +0,0 @@
|
||||
--- kscreensaver/KRandom.desktop~ 2008-02-13 10:40:44.000000000 +0100
|
||||
+++ kscreensaver/KRandom.desktop 2008-02-16 17:07:11.000000000 +0100
|
||||
@@ -5,6 +5,7 @@
|
||||
Type=Application
|
||||
Actions=Setup;InWindow;Root;
|
||||
OnlyShowIn=KDE;
|
||||
+NoDisplay=true
|
||||
Name=Random
|
||||
Name[af]=Lukrake
|
||||
Name[ar]=عشوائي
|
||||
@@ -311,4 +312,3 @@
|
||||
Name[wa]=Håyner e purnea raecene (li fond do scribanne)
|
||||
Name[zh_CN]=在 Root 窗口中显示
|
||||
Name[zh_TW]=在 Root 視窗中顯示
|
||||
-NoDisplay=true
|
||||
--- kscreensaver/KBlankscreen.desktop~ 2008-02-13 10:40:44.000000000 +0100
|
||||
+++ kscreensaver/KBlankscreen.desktop 2008-02-16 17:08:14.000000000 +0100
|
||||
@@ -5,6 +5,7 @@
|
||||
Type=Application
|
||||
Actions=Setup;InWindow;Root;
|
||||
OnlyShowIn=KDE;
|
||||
+NoDisplay=true
|
||||
Name=Blank Screen
|
||||
Name[af]=Leë Skerm
|
||||
Name[ar]=شاشة فارغة
|
||||
@@ -313,4 +314,3 @@
|
||||
Name[wa]=Håyner e purnea raecene (li fond do scribanne)
|
||||
Name[zh_CN]=在 Root 窗口中显示
|
||||
Name[zh_TW]=在 Root 視窗中顯示
|
||||
-NoDisplay=true
|
||||
@ -1,77 +0,0 @@
|
||||
#!/bin/sh
|
||||
# Script used by kdesktop to eject a removable media (CDROM/Tape/SCSI/Floppy)
|
||||
# Relies on the 'eject' program, 'cdcontrol' on *BSD
|
||||
#
|
||||
# Copyright GPL v2 by David Faure <david@mandrakesoft.com>
|
||||
#
|
||||
quiet=0
|
||||
if test "$1" = "-q"; then
|
||||
quiet=1
|
||||
shift
|
||||
fi
|
||||
|
||||
if test "$1" = "--help"; then
|
||||
echo "Usage: $0 <name> where name is a device or a mountpoint."
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if test -z "$1"; then
|
||||
for dev in /dev/cdrom /dev/dvd /dev/dvdram /dev/cdrecorder; do
|
||||
if test -e $dev; then
|
||||
lp=`readlink $dev`
|
||||
if test -n "$lp"; then
|
||||
device=/dev/$lp
|
||||
else
|
||||
device=$dev
|
||||
fi
|
||||
break
|
||||
fi
|
||||
done
|
||||
else
|
||||
device=$1
|
||||
fi
|
||||
|
||||
udi=`dcop kded mediamanager properties $device 2>/dev/null | head -n 1 `
|
||||
if test -n "$udi"; then
|
||||
dcop kded mediamanager unmount "$udi" >/dev/null 2>&1
|
||||
|
||||
block_udi=`hal-get-property --udi $udi --key block.storage_device`
|
||||
|
||||
if test -n "$block_udi"; then
|
||||
need_eject=`hal-get-property --udi $block_udi --key storage.requires_eject`
|
||||
if test "$need_eject" = "false"; then
|
||||
exit 0;
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Checking for stuff in the PATH is ugly with sh.
|
||||
# I guess this is the reason for making this a kde app...
|
||||
OS=`uname -s`
|
||||
case "$OS" in
|
||||
OpenBSD)
|
||||
cdio -f $1 eject >/dev/null 2>&1
|
||||
;;
|
||||
*BSD)
|
||||
dev=`echo $1 | sed -E -e 's#/dev/##' -e 's/([0-9])./\1/'`
|
||||
cdcontrol -f $dev eject >/dev/null 2>&1
|
||||
;;
|
||||
*)
|
||||
# Warning, it has to be either eject 2.0.x or >=2.1.5
|
||||
# Otherwise it doesn't work as expected (it requires a
|
||||
# fstab entry for no reason).
|
||||
eject_result=$(dbus-send --system --print-reply --dest=org.freedesktop.Hal $block_udi org.freedesktop.Hal.Device.Storage.Eject array:string:"" | grep int | cut -d\ -f5)
|
||||
# fallback if not true
|
||||
if [ "$eject_result" != "0" ]; then
|
||||
eject $1 >/dev/null 2>&1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
if test $? -eq 0; then
|
||||
dcop kdesktop default refreshIcons
|
||||
exit 0
|
||||
elif test $quiet -eq 0; then
|
||||
kdialog --title "KDE Eject" --error "Eject $1 failed!"
|
||||
fi
|
||||
|
||||
exit 1
|
||||
@ -1,35 +0,0 @@
|
||||
#!/usr/bin/perl
|
||||
|
||||
# Copyright: MandrakeSoft, licensed under the GPL v2.
|
||||
# modified by Laurent Montel <lmontel@mandrakesoft.com>
|
||||
|
||||
use strict;
|
||||
use MDK::Common;
|
||||
|
||||
foreach my $file (@ARGV) {
|
||||
my $no_theme;
|
||||
# grep return 0 if a match is found
|
||||
$no_theme = 1 if `grep -q -s '^UseTheme=' $file` ;
|
||||
substInFile {
|
||||
if (/SystemPath=(.*)$/) {
|
||||
my $result = $1;
|
||||
s!$!:/usr/X11R6/bin/! if $result !~ m!/usr/X11R6/bin/!;
|
||||
}
|
||||
if (/UserPath=(.*)$/) {
|
||||
my $result = $1;
|
||||
s!$!:/usr/X11R6/bin/! if $result !~ m!/usr/X11R6/bin/!;
|
||||
}
|
||||
s!^(Setup)=.*!$1=/etc/X11/xdm/Xsetup_0!;
|
||||
s!^(Startup)=.*!$1=/etc/X11/xdm/GiveConsole!;
|
||||
s!^(Reset)=.*!$1=/etc/X11/xdm/TakeConsole!;
|
||||
s!^(Xserver)=.*!$1=/etc/X11/xdm/Xservers\nServerVTs=-7\n!;
|
||||
if ($no_theme) {
|
||||
s!^(AuthComplain)=.*!$1=AuthComplain=false\nUseTheme=true\nTheme=/usr/share/mdk/dm!;
|
||||
} else {
|
||||
s!^(AuthComplain)=.*!AuthComplain=false!;
|
||||
}
|
||||
|
||||
} $file;
|
||||
}
|
||||
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
diff -p -up kdebase-3.5.9/khotkeys/khotkeys.desktop.ONLY_KDE kdebase-3.5.9/khotkeys/khotkeys.desktop
|
||||
--- kdebase-3.5.9/khotkeys/khotkeys.desktop.ONLY_KDE 2008-07-04 17:17:19.000000000 -0300
|
||||
+++ kdebase-3.5.9/khotkeys/khotkeys.desktop 2008-07-04 17:21:39.000000000 -0300
|
||||
@@ -1,2 +1,3 @@
|
||||
[Desktop Entry]
|
||||
Hidden=true
|
||||
+OnlyShowIn=KDE
|
||||
Binary file not shown.
@ -1,9 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Name=Mandriva Online Applet
|
||||
Comment=Applet for Mandriva Online
|
||||
Exec=/usr/bin/mdkapplet
|
||||
Icon=mdkonline
|
||||
Type=Application
|
||||
StartupNotify=true
|
||||
Categories=X-MandrivaLinux-System-Configuration-Networking;Settings;Network;
|
||||
X-KDE-autostart-after=kdesktop
|
||||
Binary file not shown.
@ -1,417 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.7 )
|
||||
#
|
||||
|
||||
# We are running kde3 environment
|
||||
# Let's prepend PATH to allow execution of kde3 apps first
|
||||
PATH=/opt/kde3/bin:$PATH
|
||||
export PATH
|
||||
|
||||
# When the X server dies we get a HUP signal from xinit. We must ignore it
|
||||
# because we still need to do some cleanup.
|
||||
trap 'echo GOT SIGHUP' HUP
|
||||
|
||||
# Check if a KDE session already is running
|
||||
if kcheckrunning >/dev/null 2>&1; then
|
||||
echo "KDE seems to be already running on this display."
|
||||
xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "$MDV_MENU_STYLE" = "mandriva" ]; then
|
||||
XDG_MENU_PREFIX=kde-
|
||||
export XDG_MENU_PREFIX=kde-
|
||||
fi
|
||||
|
||||
# For 2008.1 and beyond, Qt4 will be the default environment to build applications and
|
||||
# path will be pointing to qt4 bin dir as usual, so we're explicitly set QTDIR
|
||||
# for qt3 in kde3 environment
|
||||
# Remember that qt3 is in /usr/lib/qt3 even on 64 installs
|
||||
QTDIR=/usr/lib/qt3
|
||||
export QTDIR
|
||||
|
||||
# Set the background to plain grey.
|
||||
# The standard X background is nasty, causing moire effects and exploding
|
||||
# people's heads. We use colours from the standard KDE palette for those with
|
||||
# palettised displays.
|
||||
#if test -z "$XDM_MANAGED" || echo "$XDM_MANAGED" | grep ",auto" > /dev/null; then
|
||||
# xsetroot -solid "#000000"
|
||||
#fi
|
||||
|
||||
# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
|
||||
unset DYLD_FORCE_FLAT_NAMESPACE
|
||||
|
||||
# in case we have been started with full pathname spec without being in PATH
|
||||
bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
|
||||
if [ -n "$bindir" ]; then
|
||||
case $PATH in
|
||||
$bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
|
||||
*) PATH=$bindir:$PATH; export PATH;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Boot sequence:
|
||||
#
|
||||
# kdeinit is used to fork off processes which improves memory usage
|
||||
# and startup time.
|
||||
#
|
||||
# * kdeinit starts the dcopserver and klauncher first.
|
||||
# * Then kded is started. kded is responsible for keeping the sycoca
|
||||
# database up to date. When an up to date database is present it goes
|
||||
# into the background and the startup continues.
|
||||
# * Then kdeinit starts kcminit. kcminit performs initialisation of
|
||||
# certain devices according to the user's settings
|
||||
#
|
||||
# * Then ksmserver is started which takes control of the rest of the startup sequence
|
||||
|
||||
# The user's personal KDE directory is usually ~/.kde, but this setting
|
||||
# may be overridden by setting KDEHOME.
|
||||
|
||||
kdehome=$HOME/.kde
|
||||
test -n "$KDEHOME" && kdehome=`echo "$KDEHOME"|sed "s,^~/,$HOME/,"`
|
||||
|
||||
# see kstartupconfig source for usage
|
||||
mkdir -m 700 -p $kdehome
|
||||
mkdir -m 700 -p $kdehome/share
|
||||
mkdir -m 700 -p $kdehome/share/config
|
||||
cat >$kdehome/share/config/startupconfigkeys <<EOF
|
||||
kcminputrc Mouse cursorTheme ''
|
||||
kcminputrc Mouse cursorSize ''
|
||||
kpersonalizerrc General FirstLogin true
|
||||
ksplashrc KSplash Theme Default
|
||||
kcmrandrrc Display ApplyOnStartup false
|
||||
kcmrandrrc [Screen0]
|
||||
kcmrandrrc [Screen1]
|
||||
kcmrandrrc [Screen2]
|
||||
kcmrandrrc [Screen3]
|
||||
kcmfonts General forceFontDPI 0
|
||||
EOF
|
||||
kstartupconfig
|
||||
if test $? -ne 0; then
|
||||
xmessage -geometry 500x100 "Could not start kstartupconfig. Check your installation."
|
||||
fi
|
||||
. $kdehome/share/config/startupconfig
|
||||
|
||||
# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
|
||||
if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
|
||||
kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
|
||||
if test $? -eq 10; then
|
||||
export XCURSOR_THEME=default
|
||||
elif test -n "$kcminputrc_mouse_cursortheme"; then
|
||||
export XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
|
||||
fi
|
||||
if test -n "$kcminputrc_mouse_cursorsize"; then
|
||||
export XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$kcmrandrrc_display_applyonstartup" = "true"; then
|
||||
# 4 screens is hopefully enough
|
||||
for scrn in 0 1 2 3; do
|
||||
args=
|
||||
width="\$kcmrandrrc_screen${scrn}_width" ; eval "width=$width"
|
||||
height="\$kcmrandrrc_screen${scrn}_height" ; eval "height=$height"
|
||||
if test -n "${width}" -a -n "${height}"; then
|
||||
args="$args -s ${width}x${height}"
|
||||
fi
|
||||
refresh="\$kcmrandrrc_screen${scrn}_refresh" ; eval "refresh=$refresh"
|
||||
if test -n "${refresh}"; then
|
||||
args="$args -r ${refresh}"
|
||||
fi
|
||||
rotation="\$kcmrandrrc_screen${scrn}_rotation" ; eval "rotation=$rotation"
|
||||
if test -n "${rotation}"; then
|
||||
case "${rotation}" in
|
||||
0)
|
||||
args="$args -o 0"
|
||||
;;
|
||||
90)
|
||||
args="$args -o 1"
|
||||
;;
|
||||
180)
|
||||
args="$args -o 2"
|
||||
;;
|
||||
270)
|
||||
args="$args -o 3"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
reflectx="\$kcmrandrrc_screen${scrn}_reflectx" ; eval "reflectx=$reflectx"
|
||||
if test "${refrectx}" = "true"; then
|
||||
args="$args -x"
|
||||
fi
|
||||
reflecty="\$kcmrandrrc_screen${scrn}_reflecty" ; eval "reflecty=$reflecty"
|
||||
if test "${refrecty}" = "true"; then
|
||||
args="$args -y"
|
||||
fi
|
||||
if test -n "$args"; then
|
||||
xrandr $args
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
dl=$DESKTOP_LOCKED
|
||||
unset DESKTOP_LOCKED # Don't want it in the environment
|
||||
|
||||
# Launch splash that doesn't need any KDE libraries here, before
|
||||
# KDE libraries are loaded into memory (which may take some time
|
||||
# with cold caches). Makes the splash appear sooner.
|
||||
# If kpersonalizer needs to be run splash will be started only later.
|
||||
if test -z "$dl" && test "$kpersonalizerrc_general_firstlogin" != "true"; then
|
||||
case "$ksplashrc_ksplash_theme" in
|
||||
Simple)
|
||||
ksplashsimple
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
if test "$kcmfonts_general_forcefontdpi" -eq 120; then
|
||||
xrdb -quiet -merge -nocpp <<EOF
|
||||
Xft.dpi: 120
|
||||
EOF
|
||||
elif test "$kcmfonts_general_forcefontdpi" -eq 96; then
|
||||
xrdb -quiet -merge -nocpp <<EOF
|
||||
Xft.dpi: 96
|
||||
EOF
|
||||
fi
|
||||
|
||||
# Source scripts found in <localprefix>/env/*.sh and <prefixes>/env/*.sh
|
||||
# (where <localprefix> is $KDEHOME or ~/.kde, and <prefixes> is where KDE is installed)
|
||||
#
|
||||
# This is where you can define environment variables that will be available to
|
||||
# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
|
||||
# or eval `gpg-agent --daemon`.
|
||||
# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script
|
||||
#
|
||||
# (see end of this file).
|
||||
# For anything else (that doesn't set env vars, or that needs a window manager),
|
||||
# better use the Autostart folder.
|
||||
|
||||
exepath=`kde-config --path exe | tr : '\n'`
|
||||
|
||||
for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/env/,p'`; do
|
||||
for file in "$prefix"*.sh; do
|
||||
test -r "$file" && . "$file"
|
||||
done
|
||||
done
|
||||
|
||||
# Activate the kde font directories.
|
||||
#
|
||||
# There are 4 directories that may be used for supplying fonts for KDE.
|
||||
#
|
||||
# There are two system directories. These belong to the administrator.
|
||||
# There are two user directories, where the user may add her own fonts.
|
||||
#
|
||||
# The 'override' versions are for fonts that should come first in the list,
|
||||
# i.e. if you have a font in your 'override' directory, it will be used in
|
||||
# preference to any other.
|
||||
#
|
||||
# The preference order looks like this:
|
||||
# user override, system override, X, user, system
|
||||
#
|
||||
# Where X is the original font database that was set up before this script
|
||||
# runs.
|
||||
|
||||
usr_odir=$HOME/.fonts/kde-override
|
||||
usr_fdir=$HOME/.fonts
|
||||
|
||||
# Add any user-installed font directories to the X font path
|
||||
kde_fontpaths=$usr_fdir/fontpaths
|
||||
do_usr_fdir=1
|
||||
do_usr_odir=1
|
||||
if test -r "$kde_fontpaths" ; then
|
||||
savifs=$IFS
|
||||
IFS="
|
||||
"
|
||||
for fpath in `grep -v '^[ ]*#' < "$kde_fontpaths"` ; do
|
||||
rfpath=`echo $fpath | sed "s:^~:$HOME:g"`
|
||||
if test -s "$rfpath"/fonts.dir; then
|
||||
xset fp+ "$rfpath"
|
||||
if test "$rfpath" = "$usr_fdir"; then
|
||||
do_usr_fdir=0
|
||||
fi
|
||||
if test "$rfpath" = "$usr_odir"; then
|
||||
do_usr_odir=0
|
||||
fi
|
||||
fi
|
||||
done
|
||||
IFS=$savifs
|
||||
fi
|
||||
|
||||
if test -n "$KDEDIRS"; then
|
||||
kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
|
||||
sys_odir=$kdedirs_first/share/fonts/override
|
||||
sys_fdir=$kdedirs_first/share/fonts
|
||||
else
|
||||
sys_odir=$KDEDIR/share/fonts/override
|
||||
sys_fdir=$KDEDIR/share/fonts
|
||||
fi
|
||||
|
||||
# We run mkfontdir on the user's font dirs (if we have permission) to pick
|
||||
# up any new fonts they may have installed. If mkfontdir fails, we still
|
||||
# add the user's dirs to the font path, as they might simply have been made
|
||||
# read-only by the administrator, for whatever reason.
|
||||
|
||||
# Only do usr_fdir and usr_odir if they are *not* listed in fontpaths
|
||||
test -d "$sys_odir" && xset +fp "$sys_odir"
|
||||
test $do_usr_odir -eq 1 && test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
|
||||
test $do_usr_fdir -eq 1 && test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
|
||||
test -d "$sys_fdir" && xset fp+ "$sys_fdir"
|
||||
|
||||
# Ask X11 to rebuild its font list.
|
||||
xset fp rehash
|
||||
|
||||
# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
|
||||
# from some users that they're confused and don't know what to do. This is
|
||||
# especially necessary on slow machines, where starting KDE takes one or two
|
||||
# minutes until anything appears on the screen.
|
||||
#
|
||||
# If the user has overwritten fonts, the cursor font may be different now
|
||||
# so don't move this up.
|
||||
#
|
||||
xsetroot -cursor_name left_ptr
|
||||
|
||||
if [ "$(whoami)" = root ]; then
|
||||
echo
|
||||
# Root interface will point to different profile, no more hardcoded
|
||||
fi
|
||||
|
||||
if [ -e $kdehome/Autostart/alignment-icons.desktop ]; then
|
||||
rm -f $kdehome/Autostart/alignment-icons.desktop
|
||||
fi
|
||||
|
||||
export DESKTOP="kde"
|
||||
|
||||
# Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
|
||||
if test -n "$GS_LIB" ; then
|
||||
GS_LIB=$usr_fdir:$GS_LIB
|
||||
export GS_LIB
|
||||
else
|
||||
GS_LIB=$usr_fdir
|
||||
export GS_LIB
|
||||
fi
|
||||
|
||||
# Link "tmp" "socket" and "cache" resources to directory in /tmp
|
||||
# Creates:
|
||||
# - a directory /tmp/kde-$USER and links $KDEHOME/tmp-$HOSTNAME to it.
|
||||
# - a directory /tmp/ksocket-$USER and links $KDEHOME/socket-$HOSTNAME to it.
|
||||
# - a directory /var/tmp/kdecache-$USER and links $KDEHOME/cache-$HOSTNAME to it.
|
||||
# Note: temporary locations can be overriden through the KDETMP and KDEVARTMP
|
||||
# environment variables
|
||||
for resource in tmp cache socket; do
|
||||
if ! lnusertemp $resource >/dev/null; then
|
||||
echo 'startkde: Call to lnusertemp failed (temporary directories full?). Check your installation.' 1>&2
|
||||
xmessage -geometry 600x100 "Call to lnusertemp failed (temporary directories full?). Check your installation."
|
||||
exit 1
|
||||
fi
|
||||
done
|
||||
|
||||
# In case of dcop sockets left by a previous session, cleanup
|
||||
dcopserver_shutdown
|
||||
|
||||
echo 'startkde: Starting up...' 1>&2
|
||||
|
||||
if test -z "$dl"; then
|
||||
# the splashscreen and progress indicator
|
||||
case "$ksplashrc_ksplash_theme" in
|
||||
None)
|
||||
;; # nothing
|
||||
Simple)
|
||||
if test "$kpersonalizerrc_general_firstlogin" = "true"; then
|
||||
ksplashsimple
|
||||
fi # otherwise started earlier
|
||||
;;
|
||||
*)
|
||||
ksplash --nodcop
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
|
||||
# Mark that full KDE session is running (e.g. Konqueror preloading works only
|
||||
# with full KDE running). The KDE_FULL_SESSION property can be detected by
|
||||
# any X client connected to the same X session, even if not launched
|
||||
# directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION
|
||||
# however guarantees that the application is launched in the same environment
|
||||
# like the KDE session and that e.g. KDE utilities/libraries are available.
|
||||
# KDE_FULL_SESSION property is also only available since KDE 3.5.5.
|
||||
# The matching tests are:
|
||||
# For $KDE_FULL_SESSION:
|
||||
# if test -n "$KDE_FULL_SESSION"; then ... whatever
|
||||
# For KDE_FULL_SESSION property:
|
||||
# xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
|
||||
# if test $? -eq 0; then ... whatever
|
||||
#
|
||||
# Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid
|
||||
# of the user running the KDE session. It should be rarely needed (e.g.
|
||||
# after sudo to prevent desktop-wide functionality in the new user's kded).
|
||||
#
|
||||
KDE_FULL_SESSION=true
|
||||
export KDE_FULL_SESSION
|
||||
xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
|
||||
KDE_SESSION_UID=$UID
|
||||
export KDE_SESSION_UID
|
||||
|
||||
# We set LD_BIND_NOW to increase the efficiency of kdeinit.
|
||||
# kdeinit unsets this variable before loading applications.
|
||||
LD_BIND_NOW=true start_kdeinit --new-startup +kcminit_startup
|
||||
if test $? -ne 0; then
|
||||
# Startup error
|
||||
echo 'startkde: Could not start kdeinit. Check your installation.' 1>&2
|
||||
xmessage -geometry 500x100 "Could not start kdeinit. Check your installation."
|
||||
fi
|
||||
|
||||
# If the session should be locked from the start (locked autologin),
|
||||
# lock now and do the rest of the KDE startup underneath the locker.
|
||||
if test -n "$dl"; then
|
||||
kwrapper kdesktop_lock --forcelock &
|
||||
# Give it some time for starting up. This is somewhat unclean; some
|
||||
# notification would be better.
|
||||
sleep 1
|
||||
fi
|
||||
|
||||
# finally, give the session control to the session manager
|
||||
# see kdebase/ksmserver for the description of the rest of the startup sequence
|
||||
# if the KDEWM environment variable has been set, then it will be used as KDE's
|
||||
# window manager instead of kwin.
|
||||
# if KDEWM is not set, ksmserver will ensure kwin is started.
|
||||
# kwrapper is used to reduce startup time and memory usage
|
||||
# kwrapper does not return usefull error codes such as the exit code of ksmserver.
|
||||
# We only check for 255 which means that the ksmserver process could not be
|
||||
# started, any problems thereafter, e.g. ksmserver failing to initialize,
|
||||
# will remain undetected.
|
||||
test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
|
||||
kwrapper ksmserver $KDEWM
|
||||
if test $? -eq 255; then
|
||||
# Startup error
|
||||
echo 'startkde: Could not start ksmserver. Check your installation.' 1>&2
|
||||
xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
|
||||
fi
|
||||
|
||||
# wait if there's any crashhandler shown
|
||||
while dcop | grep -q ^drkonqi- ; do
|
||||
sleep 5
|
||||
done
|
||||
|
||||
echo 'startkde: Shutting down...' 1>&2
|
||||
|
||||
# Clean up
|
||||
kdeinit_shutdown
|
||||
dcopserver_shutdown --wait
|
||||
artsshell -q terminate
|
||||
|
||||
echo 'startkde: Running shutdown scripts...' 1>&2
|
||||
|
||||
# Run scripts found in $KDEDIRS/shutdown
|
||||
for prefix in `echo "$exepath" | sed -n -e 's,/bin[^/]*/,/shutdown/,p'`; do
|
||||
for file in `ls "$prefix" 2> /dev/null | egrep -v '(~|\.bak)$'`; do
|
||||
test -x "$prefix$file" && "$prefix$file"
|
||||
done
|
||||
done
|
||||
|
||||
unset KDE_FULL_SESSION
|
||||
xprop -root -remove KDE_FULL_SESSION
|
||||
unset KDE_SESSION_UID
|
||||
|
||||
echo 'startkde: Done.' 1>&2
|
||||
@ -1,10 +0,0 @@
|
||||
diff -Naur kdebase-3.5.10/kioslave/media/services/media_safelyremove.desktop kdebase-3.5.10.yeni/kioslave/media/services/media_safelyremove.desktop
|
||||
--- kdebase-3.5.10/kioslave/media/services/media_safelyremove.desktop 2008-08-19 21:16:59.000000000 +0300
|
||||
+++ kdebase-3.5.10.yeni/kioslave/media/services/media_safelyremove.desktop 2009-12-22 00:51:57.122282682 +0200
|
||||
@@ -71,5 +71,5 @@
|
||||
Name[wa]=Ositer e såvrité
|
||||
Name[zh_CN]=安全删除
|
||||
Name[zh_TW]=安全的移除
|
||||
-Exec=kio_media_mounthelper -s %u
|
||||
+Exec=kio_media_mounthelper -u %u
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- kdebase-3.5.12/kioslave/media/mediamanager/halbackend.cpp.orig 2011-02-04 16:20:42.266474457 +0000
|
||||
+++ kdebase-3.5.12/kioslave/media/mediamanager/halbackend.cpp 2011-02-04 16:21:33.580473069 +0000
|
||||
@@ -520,7 +520,7 @@
|
||||
medium->mountableState(
|
||||
libhal_volume_get_device_file(halVolume), /* Device node */
|
||||
clearUdiString,
|
||||
- libhal_volume_get_mount_point(halClearVolume), /* Mount point */
|
||||
+ TQString::fromUtf8(libhal_volume_get_mount_point(halVolume)), /* Mount point */
|
||||
libhal_volume_get_fstype(halClearVolume), /* Filesystem type */
|
||||
libhal_volume_is_mounted(halClearVolume) ); /* Mounted ? */
|
||||
else
|
||||
@ -1,9 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Name=NetApplet
|
||||
Comment=Network monitoring applet
|
||||
Exec=/usr/bin/net_applet
|
||||
Icon=/usr/share/libDrakX/pixmaps/connected.png
|
||||
Type=Application
|
||||
Categories=GTK;System;Monitor;X-MandrivaLinux-CrossDesktop;
|
||||
X-KDE-autostart-after=kdesktop
|
||||
StartupNotify=false
|
||||
@ -1,5 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Type=MimeType
|
||||
Comment=urpmi file
|
||||
MimeType=application/x-urpmi;
|
||||
Patterns=*.urpmi;
|
||||
@ -1,7 +0,0 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Exec=xsettings-kde
|
||||
Name=XSettings-KDE
|
||||
X-KDE-autostart-after=kdesktop
|
||||
Type=Service
|
||||
OnlyShowIn=KDE;
|
||||
@ -1,758 +0,0 @@
|
||||
%define oname kdebindings
|
||||
%define _disable_final 1
|
||||
|
||||
%define compile_apidox 1
|
||||
%{?_no_apidox: %{expand: %%global compile_apidox 0}}
|
||||
|
||||
%define internal_sip 0
|
||||
%{?_internal_sip: %{expand: %%global internal_sip 1}}
|
||||
|
||||
%define java 1
|
||||
|
||||
%define lib_major_kdec 1
|
||||
%define lib_kdec %mklibname kdec %{lib_major_kdec}
|
||||
|
||||
%define lib_major_kjsembed 1
|
||||
%define lib_kjsembed %mklibname kde3kjsembed %{lib_major_kjsembed}
|
||||
|
||||
%define lib_major_smoke 1
|
||||
%define lib_smoke %mklibname smoke %{lib_major_smoke}
|
||||
|
||||
%define perl_man3dir %_mandir
|
||||
|
||||
Name: kde3-%{oname}
|
||||
Summary: Kdebindings
|
||||
Version: 3.5.12
|
||||
Release: %mkrel 1
|
||||
Epoch: 1
|
||||
Group: Graphical desktop/KDE3
|
||||
URL: ftp://ftp.kde.org/pub/kde/stable/%version/src/
|
||||
Source0: ftp://ftp.kde.org/pub/kde/stable/%version/src/%oname-%version.tar.bz2
|
||||
#Patch0: kdebindings-3.5.8-gcc4-bug21304-workaround.patch
|
||||
#Patch1: kdebindings-3.5.10-cast-fix.patch
|
||||
Patch2: kdebindings-3.5.7-fix-man-dir.patch
|
||||
Patch3: kdebindings-3.5.7-java-ldflags.patch
|
||||
Patch4: kdebindings-3.5.7-sinjdoc.patch
|
||||
Patch5: kde-3.5.10-acinclude.patch
|
||||
#Patch6: fix_autotools.patch
|
||||
Patch7: kdebase-3.5.12-move-xdg-menu-dir.patch
|
||||
Patch8: kdebase-3.5.12-config.patch
|
||||
|
||||
License: GPL
|
||||
BuildRoot: %_tmppath/%oname-%version-%release-root
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
%endif
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
BuildRequires: gettext
|
||||
BuildRequires: kdelibs3-devel
|
||||
BuildRequires: kdebase3-devel
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: perl-devel
|
||||
BuildRequires: texinfo
|
||||
BuildRequires: ruby-devel
|
||||
BuildRequires: openssl-devel
|
||||
%if %with java
|
||||
%if %mdkversion < 200810
|
||||
BuildRequires: jpackage-utils
|
||||
%else
|
||||
BuildRequires: java-rpmbuild
|
||||
%endif
|
||||
BuildRequires: java-devel-openjdk
|
||||
%endif
|
||||
# External packages now
|
||||
#BuildConflicts: python-devel
|
||||
|
||||
|
||||
%description
|
||||
This package contains:
|
||||
* dcopjava: DCOP bindings for Java
|
||||
* dcopperl: DCOP bindings for Perl
|
||||
* kalyptus: C, Objective-C and Java bindings generator
|
||||
* koala (optional): KDE bindings for Java JNI to use Qt/KDE classes with Java
|
||||
* qtjava (optional): Qt bindings for Java JNI to use Qt/KDE classes with Java
|
||||
* ruby-qt: Qt bindings for Ruby
|
||||
|
||||
#------------------------------------------------------------
|
||||
|
||||
%define lib_smoke_kde %mklibname smokekde 1
|
||||
|
||||
%package -n %{lib_smoke_kde}
|
||||
Summary: KDE generic bindings library
|
||||
Group: Development/KDE and Qt
|
||||
Provides: %{oname}-%{lib_smoke_kde} = %epoch:%version-%release
|
||||
Obsoletes: %{lib_kdec}-devel < 3.5.1
|
||||
Obsoletes: %{lib_kdec} < 3.5.1
|
||||
Obsoletes: libsmoke1 <= 3.5.1
|
||||
|
||||
|
||||
%description -n %{lib_smoke_kde}
|
||||
KDE generic bindings library.
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n %{lib_smoke_kde} -p /sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %{lib_smoke_kde} -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files -n %{lib_smoke_kde}
|
||||
%defattr(-,root,root)
|
||||
%_kde3_libdir/libsmokekde.so.*
|
||||
|
||||
#------------------------------------------------------------
|
||||
|
||||
%define lib_smoke_qt %mklibname smokeqt 1
|
||||
|
||||
%package -n %{lib_smoke_qt}
|
||||
Summary: Qt generic bindings library
|
||||
Group: Development/KDE and Qt
|
||||
Provides: %{oname}-%{lib_smoke_qt} = %epoch:%version-%release
|
||||
Obsoletes: %{lib_kdec}-devel < 3.5.1
|
||||
Obsoletes: %{lib_kdec} < 3.5.1
|
||||
Obsoletes: libsmoke1 <= 3.5.1
|
||||
|
||||
%description -n %{lib_smoke_qt}
|
||||
Qt generic bindings library.
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n %{lib_smoke_qt} -p /sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %{lib_smoke_qt} -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files -n %{lib_smoke_qt}
|
||||
%defattr(-,root,root)
|
||||
%_kde3_libdir/libsmokeqt.so.*
|
||||
|
||||
#------------------------------------------------------------
|
||||
|
||||
%package -n smoke-devel
|
||||
Summary: Header files for libsmoke
|
||||
Group: Development/KDE and Qt
|
||||
Requires: %{lib_smoke_qt} = %epoch:%version-%release
|
||||
Requires: %{lib_smoke_kde} = %epoch:%version-%release
|
||||
Provides: libsmoke-devel = %epoch:%version-%release
|
||||
Provides: %{oname}-smoke-devel = %epoch:%version-%release
|
||||
Obsoletes: %{lib_smoke}-devel < 3.5.1
|
||||
Obsoletes: %{lib_kdec}-devel < 3.5.1
|
||||
Obsoletes: %{lib_kdec} < 3.5.1
|
||||
|
||||
%description -n smoke-devel
|
||||
Smoke devel files.
|
||||
|
||||
%files -n smoke-devel
|
||||
%defattr(-,root,root)
|
||||
%_kde3_includedir/smoke.h
|
||||
%_kde3_libdir/libsmokekde.la
|
||||
%_kde3_libdir/libsmokekde.so
|
||||
%_kde3_libdir/libsmokeqt.so
|
||||
%_kde3_libdir/libsmokeqt.la
|
||||
|
||||
#------------------------------------------------------------
|
||||
|
||||
%package -n kde3-kjsembed
|
||||
Summary: KJS Javascript interpreter
|
||||
Group: Development/KDE and Qt
|
||||
Conflicts: %{lib_smoke_kde} <= %{epoch}:3.5.0-2mdk
|
||||
Obsoletes: kjsembed < 1:3.5.10
|
||||
|
||||
%description -n kde3-kjsembed
|
||||
A library for embedding the KJS Javascript interpreter in application.
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n kde3-kjsembed
|
||||
%update_menus
|
||||
%update_icon_cache hicolor
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun -n kde3-kjsembed
|
||||
%clean_menus
|
||||
%clean_icon_cache hicolor
|
||||
%endif
|
||||
|
||||
|
||||
%files -n kde3-kjsembed
|
||||
%defattr(-,root,root)
|
||||
%_kde3_bindir/kjscmd
|
||||
# %_kde3_bindir/jsaccess
|
||||
%_kde3_bindir/embedjs
|
||||
%_kde3_libdir/kde3/libqprocessplugin.*
|
||||
%_kde3_libdir/kde3/libjsconsoleplugin.*
|
||||
# %_kde3_libdir/kde3/libcustomobjectplugin.*
|
||||
# %_kde3_libdir/kde3/libcustomqobjectplugin.*
|
||||
%_kde3_libdir/kde3/libimagefxplugin.*
|
||||
%_kde3_libdir/kde3/libfileitemplugin.*
|
||||
%_kde3_libdir/kde3/libjavascript.*
|
||||
%_kde3_datadir/applnk/Utilities/embedjs.desktop
|
||||
%_kde3_appsdir/embedjs/embedjsui.rc
|
||||
%_kde3_appsdir/kate/scripts/swaptabs.desktop
|
||||
%_kde3_appsdir/kate/scripts/swaptabs.js
|
||||
%_kde3_appsdir/kate/scripts/swaptabs.ui
|
||||
%_kde3_appsdir/kjsembed/cmdline.js
|
||||
%_kde3_datadir/services/qprocess_plugin.desktop
|
||||
%_kde3_datadir/applications/kde/kjscmd.desktop
|
||||
# %_kde3_datadir/services/customobject_plugin.desktop
|
||||
# %_kde3_datadir/services/customqobject_plugin.desktop
|
||||
%_kde3_datadir/servicetypes/binding_type.desktop
|
||||
%_kde3_datadir/services/imagefx_plugin.desktop
|
||||
%_kde3_datadir/services/javascript.desktop
|
||||
%_kde3_datadir/services/kfileitem_plugin.desktop
|
||||
%_kde3_datadir/icons/*/*/*/embedjs.png
|
||||
%_mandir/man1/kjscmd.1*
|
||||
|
||||
#------------------------------------------------------------
|
||||
|
||||
%package -n %lib_kjsembed
|
||||
Summary: KJS Javascript interpreter
|
||||
Group: Development/KDE and Qt
|
||||
Conflicts: kjsembed < 3.5.1
|
||||
Provides: %{oname}-%lib_kjsembed = %epoch:%version-%release
|
||||
|
||||
%description -n %lib_kjsembed
|
||||
A library for embedding the KJS Javascript interpreter in application.
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %lib_kjsembed -p /sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%post -n %lib_kjsembed -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files -n %lib_kjsembed
|
||||
%defattr(-,root,root)
|
||||
%_kde3_libdir/libkjsembed.so.*
|
||||
|
||||
#------------------------------------------------------------
|
||||
|
||||
%package -n %lib_kjsembed-devel
|
||||
Summary: Header files for KJS Javascript interpreter
|
||||
Group: Development/KDE and Qt
|
||||
Requires: %lib_kjsembed = %epoch:%version-%release
|
||||
Provides: kjsembed-devel = %epoch:%version-%release
|
||||
Provides: %{oname}-%lib_kjsembed-devel = %epoch:%version-%release
|
||||
Conflicts: %lib_kjsembed < 1:3.5.1
|
||||
|
||||
%description -n %lib_kjsembed-devel
|
||||
Header files for embedding the KJS Javascript interpreter in application.
|
||||
|
||||
%files -n %lib_kjsembed-devel
|
||||
%defattr(-,root,root)
|
||||
%dir %_kde3_includedir/kjsembed/
|
||||
%_kde3_includedir/kjsembed/*.h
|
||||
%_kde3_libdir/libkjsembed.so
|
||||
%_kde3_libdir/libkjsembed.la
|
||||
|
||||
#------------------------------------------------------------
|
||||
|
||||
%package -n perl-DCOP
|
||||
Summary: Perl DCOP bindings
|
||||
Group: Development/KDE and Qt
|
||||
Obsoletes: kdec < 3.5.1
|
||||
Obsoletes: %{lib_kdec} < 3.5.1
|
||||
Provides: %{oname}-perl-DCOP = %epoch:%version-%release
|
||||
|
||||
%description -n perl-DCOP
|
||||
Perl DCOP bindings.
|
||||
|
||||
%files -n perl-DCOP
|
||||
%defattr(-,root,root)
|
||||
%_mandir/man3/DCOP.*
|
||||
%perl_sitearch/*.pm
|
||||
%perl_sitearch/DCOP/Object.pm
|
||||
%perl_sitearch/auto/DCOP/*.so
|
||||
|
||||
#------------------------------------------------------------
|
||||
|
||||
%define lib_ruby %mklibname qtruby
|
||||
|
||||
%package -n ruby-qt
|
||||
Summary: Qt bindings for Ruby
|
||||
Group: Development/KDE and Qt
|
||||
Provides: qtruby = %{epoch}:%{version}-%{release}
|
||||
Provides: %{oname}-ruby-qt = %epoch:%version-%release
|
||||
Obsoletes: %{lib_ruby} < 3.5.1
|
||||
Obsoletes: %{lib_ruby}1 < 3.5.1
|
||||
Obsoletes: %{lib_ruby}1-devel < 3.5.1
|
||||
Obsoletes: qtruby < 3.5.5
|
||||
|
||||
%description -n ruby-qt
|
||||
A binding for Ruby language.
|
||||
|
||||
%files -n ruby-qt
|
||||
%defattr(-,root,root)
|
||||
%_kde3_bindir/krubyinit
|
||||
%_kde3_bindir/qtrubyinit
|
||||
%_kde3_bindir/rbkdeapi
|
||||
%_kde3_bindir/rbkdesh
|
||||
%_kde3_bindir/rbqtapi
|
||||
%_kde3_bindir/rbqtsh
|
||||
%_kde3_bindir/rbuic
|
||||
%_kde3_bindir/rbkconfig_compiler
|
||||
%{_prefix}/lib/ruby/1.8/*
|
||||
#%{_prefix}/lib/ruby/1.8/*/*
|
||||
|
||||
#------------------------------------------------------------
|
||||
|
||||
%if %with java
|
||||
|
||||
%define libqtjava %mklibname qtjavasupport 1
|
||||
|
||||
%package -n %{libqtjava}
|
||||
Summary: Qt Java support library
|
||||
Group: Development/KDE and Qt
|
||||
Provides: %{oname}-%{libqtjava} = %epoch:%version-%release
|
||||
|
||||
%description -n %{libqtjava}
|
||||
Qt Java support library.
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n %{libqtjava} -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %{libqtjava} -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files -n %{libqtjava}
|
||||
%defattr(-,root,root)
|
||||
%_kde3_libdir/libqtjavasupport.so.*
|
||||
|
||||
%package -n qtjava
|
||||
Summary: Qt bindings for Java
|
||||
Group: Development/KDE and Qt
|
||||
Provides: java-qt = %{epoch}:%{version}-%{release}
|
||||
Provides: %{oname}-qtjava = %epoch:%version-%release
|
||||
|
||||
%description -n qtjava
|
||||
Qt bindings for Java.
|
||||
|
||||
%files -n qtjava
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc qtjava/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README,TODO}
|
||||
%doc qtjava/javalib/{examples,test,tutorial}
|
||||
%attr(0755,root,root) %{_kde3_bindir}/javalib
|
||||
%{_jnidir}/qtjava.jar
|
||||
%{_jnidir}/qtjava-%{version}.jar
|
||||
%{_kde3_libdir}/libqtjava.so
|
||||
%doc %{_datadir}/doc/HTML/en/javalib
|
||||
%{_kde3_datadir}/qtjava
|
||||
%{_kde3_docdir}/HTML/en/javalib
|
||||
|
||||
%package -n qtjava-javadoc
|
||||
Summary: Javadoc for qtjava
|
||||
Group: Development/Java
|
||||
Provides: java-qt-javadoc = %{epoch}:%{version}-%{release}
|
||||
Provides: %{oname}-qtjava-javadoc = %epoch:%version-%release
|
||||
|
||||
%description -n qtjava-javadoc
|
||||
Javadoc for qtjava.
|
||||
|
||||
%files -n qtjava-javadoc
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc %{_javadocdir}/qtjava-%{version}
|
||||
%doc %dir %{_javadocdir}/qtjava
|
||||
|
||||
%package -n koala
|
||||
Summary: KDE bindings for Java
|
||||
Group: Development/KDE and Qt
|
||||
Requires: qtjava = %{epoch}:%{version}-%{release}
|
||||
Provides: %{oname}-koala = %epoch:%version-%release
|
||||
|
||||
%description -n koala
|
||||
KDE bindings for Java.
|
||||
|
||||
%files -n koala
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc kdejava/{AUTHORS,COPYING.LIB,ChangeLog,INSTALL,NEWS,README,TODO}
|
||||
%doc kdejava/koala/{examples,test}
|
||||
%attr(0755,root,root) %{_bindir}/koala
|
||||
%{_jnidir}/koala.jar
|
||||
%{_jnidir}/koala-%{version}.jar
|
||||
%attr(-,root,root) %{_libdir}/libkdejava.*
|
||||
|
||||
%package -n koala-javadoc
|
||||
Summary: Javadoc for koala
|
||||
Group: Development/Java
|
||||
Provides: java-qt-javadoc = %{version}-%{release}
|
||||
Provides: %{oname}-koala-javadoc = %epoch:%version-%release
|
||||
|
||||
%description -n koala-javadoc
|
||||
Javadoc for koala.
|
||||
|
||||
%files -n koala-javadoc
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc %{_javadocdir}/koala-%{version}
|
||||
%doc %dir %{_javadocdir}/koala
|
||||
%endif
|
||||
|
||||
#------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q -n %{oname}-%{version}
|
||||
%{__mkdir_p} qtjava/javalib/api
|
||||
%{__mkdir_p} kdejava/koala/api
|
||||
#%patch0 -p0 -b .gcc4
|
||||
#%patch1 -p1 -b .cast
|
||||
%patch2 -p1 -b .mandir
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%if %mdkversion >= 201000
|
||||
%patch5 -p1
|
||||
#%patch6 -p1
|
||||
%endif
|
||||
%patch7 -p0
|
||||
%patch8 -p0
|
||||
|
||||
%build
|
||||
PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
|
||||
export xdg_menudir=%_sysconfdir/xdg/kde/menus
|
||||
|
||||
make -f admin/Makefile.common cvs
|
||||
|
||||
%configure_kde3 \
|
||||
%if %with java
|
||||
--with-java=%{java_home}
|
||||
%else
|
||||
--without-java
|
||||
%endif
|
||||
|
||||
# kdebindings doesn't like smp compiling
|
||||
make
|
||||
|
||||
%if %with java
|
||||
pushd qtjava/javalib/api
|
||||
%{javadoc} -classpath ".." -splitindex -windowtitle "Qt 3.2 Java api" ../org/kde/qt/*.java
|
||||
popd
|
||||
|
||||
pushd kdejava/koala/api
|
||||
%{javadoc} -classpath "../koala.jar:../../../qtjava/javalib/qtjava.jar" \
|
||||
-author -version -splitindex -windowtitle "Koala KDE 3.5.9 Java api" ../org/kde/koala/*.java -J-Xmx128m
|
||||
popd
|
||||
%endif
|
||||
|
||||
%install
|
||||
if [ -d %buildroot ]; then rm -r %buildroot; fi
|
||||
|
||||
%makeinstall_std
|
||||
|
||||
%if %with java
|
||||
|
||||
%{__rm} %{buildroot}%{_kde3_libdir}/libqtjava.la
|
||||
%{__rm} %{buildroot}%{_kde3_libdir}/libkdejava.la
|
||||
|
||||
%{__rm} %{buildroot}%{_kde3_libdir}/libqtjavasupport.la
|
||||
%{__rm} %{buildroot}%{_kde3_libdir}/libqtjavasupport.so
|
||||
|
||||
%{__rm} %{buildroot}%/usr/lib/python2.6/site-packages/pcop.la
|
||||
%{__rm} %{buildroot}%/usr/lib/python2.6/site-packages/pcop.so
|
||||
%{__rm} %{buildroot}%/usr/lib/python2.6/site-packages/pydcop.py
|
||||
|
||||
(cd %{buildroot}%{_jnidir} && for jar in *.jar; do %{__mv} ${jar} `/bin/basename ${jar} .jar`-%{version}.jar; done)
|
||||
(cd %{buildroot}%{_jnidir} && for jar in *-%{version}*; do %{__ln_s} ${jar} ${jar/-%{version}/}; done)
|
||||
|
||||
%{__mkdir_p} %{buildroot}%{_javadocdir}/qtjava-%{version}
|
||||
%{__cp} -a qtjava/javalib/api/* %{buildroot}%{_javadocdir}/qtjava-%{version}
|
||||
%{__ln_s} qtjava-%{version} %{buildroot}%{_javadocdir}/qtjava
|
||||
|
||||
%{__mkdir_p} %{buildroot}%{_javadocdir}/koala-%{version}
|
||||
%{__cp} -a kdejava/koala/api/* %{buildroot}%{_javadocdir}/koala-%{version}
|
||||
%{__ln_s} koala-%{version} %{buildroot}%{_javadocdir}/koala
|
||||
|
||||
%endif
|
||||
|
||||
%clean
|
||||
if [ -d %buildroot ]; then rm -r %buildroot; fi
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 22 2011 Tim Williams <tim@my-place.org.uk> 1:3.5.12-1mvt2010.2
|
||||
+ Rebuild for Trinity
|
||||
- Remove autoconf patch
|
||||
+ Add xdg and kdebase build patch
|
||||
- Remove kdebindings-3.5.8-gcc4-bug21304-workaround.patch
|
||||
- Remove kdebindings-3.5.10-cast-fix.patch
|
||||
- Remove jsaccess, libcustomobjectplugin.*, libcustomqobjectplugin.*, customobject_plugin.desktop, customqobject_plugin.desktop
|
||||
from files list for kjsembed package. They no longer seem to be built/installed.
|
||||
|
||||
* Mon Jul 19 2010 Tim Williams <tim@my-place.org.uk> 1:3.5.10-7mvt2010.1
|
||||
+ Rebuild for MDV 2010.1
|
||||
|
||||
* Sun Jan 17 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:3.5.10-6mvt2010.0
|
||||
+ KDE builds with autoconf 2.65, add patch for this and
|
||||
set autoconf to version 2.65:patch5
|
||||
+ Fix automake 1.11 issue:patch6
|
||||
|
||||
* Wed Dec 23 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:3.5.10-5mvt2010.0
|
||||
- Use upper release number to avoid unwanted KDE4 upgrade
|
||||
|
||||
* Mon Dec 21 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:3.5.10-1mdv2010.0
|
||||
+ Reubilt for 2010.0 release
|
||||
|
||||
* Wed Mar 25 2009 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.10-2mdv2009.1
|
||||
+ Revision: 361142
|
||||
- Bump to rebuild against cooker
|
||||
|
||||
* Mon Sep 01 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.10-1mdv2009.0
|
||||
+ Revision: 278727
|
||||
- Fixed kdebindings 3.5.10 build
|
||||
- Renamed kjsembed to kde3-kjsembed. Amarok will be fixed later
|
||||
|
||||
+ Funda Wang <fundawang@mandriva.org>
|
||||
- There is no more qscintilla-qt3
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- Rebuild for missing package
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
|
||||
- do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
|
||||
|
||||
* Wed May 07 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-2mdv2009.0
|
||||
+ Revision: 203483
|
||||
- Move for /opt
|
||||
- Disable java bindings since is completly mess right now
|
||||
- Fixed proper build requires, due wrong report from buildsystem
|
||||
- Mopve for new opt path
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- Add switch for backports
|
||||
|
||||
* Fri Feb 15 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-1mdv2008.1
|
||||
+ Revision: 169021
|
||||
- Get away from branches. Last KDE 3 arriving !!
|
||||
- Removed post-3.5.8 patches integrated
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- fix summary-not-capitalized
|
||||
|
||||
* Mon Jan 14 2008 Pixel <pixel@mandriva.com> 1:3.5.8-4mdv2008.1
|
||||
+ Revision: 151453
|
||||
- rebuild for perl-5.10.0
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
* Sun Dec 30 2007 Funda Wang <fundawang@mandriva.org> 1:3.5.8-3mdv2008.1
|
||||
+ Revision: 139508
|
||||
- rebuild
|
||||
|
||||
* Mon Dec 17 2007 Thierry Vignaud <tvignaud@mandriva.com> 1:3.5.8-2mdv2008.1
|
||||
+ Revision: 127622
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
- fix summary-ended-with-dot
|
||||
|
||||
+ Anssi Hannula <anssi@mandriva.org>
|
||||
- buildrequire java-rpmbuild, i.e. build with icedtea on x86(_64)
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- Kde 3.5.8
|
||||
Rediff patches
|
||||
|
||||
* Sun Sep 23 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.7-13mdv2008.0
|
||||
+ Revision: 92431
|
||||
- Fix BuildRequires
|
||||
- [BUGFIX] Do not show EmbedJS on the menu (Bug #33331)
|
||||
- [BUGFIX] Do not show kjscmd on the menu (Bug #33332)
|
||||
|
||||
+ Anssi Hannula <anssi@mandriva.org>
|
||||
- rebuild to filter out autorequires on GCJ AOT objects
|
||||
- remove unnecessary Requires(post) on java-gcj-compat
|
||||
|
||||
* Mon Aug 20 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-10mdv2008.0
|
||||
+ Revision: 67996
|
||||
- Disable python bindings build. External updated ones now are used
|
||||
|
||||
* Thu Aug 16 2007 David Walluck <walluck@mandriva.org> 1:3.5.7-9mdv2008.0
|
||||
+ Revision: 64093
|
||||
- fix explicit .bz2 extension on kjscmd.1 in file list
|
||||
- make datadir for qtjava/javalib and kdejava/koala match %%_jnidir
|
||||
- add additional documentation (examples, test, tutorial) which is not necessarily buildable
|
||||
- copy the qtjava/designer files into the qtjava package
|
||||
- build qtjava and koala
|
||||
|
||||
* Tue May 29 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-4mdv2008.0
|
||||
+ Revision: 32557
|
||||
- Fix buildrequires
|
||||
- Updated for python qt 3.17.2
|
||||
- Updated for sip 4.6
|
||||
- Updated for python kde 3.16
|
||||
- Removed the excludion of Mandriva Linux on python kde configure. Bad packaging on the past made
|
||||
maintainers put Mandriva in a blacklist. No longer necessary.
|
||||
- Fix qscintilla test. The "multiarch" strategy breaks tests in on more application. We need to be
|
||||
sure if this approach worth expend lot of time maintaining package fixes for us only when whole
|
||||
world have a better life and have no problems at all
|
||||
- Fix configure to install in proper place some python kde binaries
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- Add patch8 : Fix man dir (close bug #23903)
|
||||
- Add missing category ( Patch4)
|
||||
|
||||
* Wed May 23 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-2mdv2008.0
|
||||
+ Revision: 29971
|
||||
- Fix kdebindings to build against new qscintilla 1.7.
|
||||
- 3.5.7 release
|
||||
|
||||
+ Funda Wang <fundawang@mandriva.org>
|
||||
- BuildRequires python-devel
|
||||
|
||||
|
||||
* Fri Feb 02 2007 Laurent Montel <lmontel@mandriva.com> 3.5.6-1mdv2007.0
|
||||
+ Revision: 115883
|
||||
- 3.5.6
|
||||
|
||||
* Wed Dec 13 2006 Laurent Montel <lmontel@mandriva.com> 1:3.5.5-4mdv2007.1
|
||||
+ Revision: 96179
|
||||
- Add patch to compile under x86_64 (improve patch from neoclust)
|
||||
- Rebuild again new python
|
||||
- 3.5.5
|
||||
|
||||
+ Helio Chissini de Castro <helio@mandriva.com>
|
||||
- Introducing 3.5.5 ( stange not be compiled before )
|
||||
- Recompiling against new python
|
||||
- Fix python macros ( was hardcoded on 2.4 )
|
||||
- Renamed qtruby as ruby-qt, matching with other ruby modules naming scheme
|
||||
- Removed old invalid qtlib patch
|
||||
|
||||
* Sun Aug 06 2006 Laurent Montel <lmontel@mandriva.com> 1:3.5.4-1mdv2007.0
|
||||
+ Revision: 53355
|
||||
- New package (2006/08/05 3.5.4-1mdv)
|
||||
- Remove EmbedJS just test program not necessary into package
|
||||
|
||||
* Sat Jul 22 2006 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.3-4mdv2007.0
|
||||
+ Revision: 41887
|
||||
- Increase release
|
||||
- Fixed typo that prevents python-qt install. http://qa.mandriva.com/show_bug.cgi?id=23871
|
||||
|
||||
* Fri Jul 21 2006 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.3-3mdv2007.0
|
||||
+ Revision: 41713
|
||||
- Disable smp compiling.
|
||||
- Fix requires for python-qt
|
||||
- Fixed configure macro
|
||||
- Updated for main stable upstream version 3.5.3
|
||||
- Fixed gcc 4 memory compile eater. Thanks to Danny.
|
||||
- Fixed wrong lib64 detection
|
||||
- Finally obsoleting external PyQt and sip packages. kdebindings provide up-to-date
|
||||
versions.
|
||||
- Naming match python style now, so now we have python-kde and python-qt and
|
||||
python-sip.
|
||||
- Fix for bug http://qa.mandriva.com/show_bug.cgi?id=17440
|
||||
- Missing obsoletes
|
||||
- Initial java package preparation. The current position of libgcj need some changes in
|
||||
java-compat tools. No effective package is created now.
|
||||
- Both archs use multiarch on config.h
|
||||
- x86 need test qtlib as well
|
||||
- Bad bad multiproc compilation. kdebindings and cluster don't like distributed comp.
|
||||
- Add missing patch
|
||||
- Remodel kdebindings package using 3.5.1 release
|
||||
- Smoke package is obsoleted in favor to move wrong placed sip runtime files to PyKDE new package
|
||||
- x86_64 installs works
|
||||
- kdec is finally obsoleted. The wrong files in there is moved to new packages
|
||||
perl-DCOP, python-dcop, lib(%%arch)smokeqt and lib(%%arch)smokekde. this solve a
|
||||
old nasty problem with dependencies.
|
||||
- Create the smoke-devel package. perl-Qt bindings will be built correctly now.
|
||||
- PyKDE package is created and is built against PyQt package and sip
|
||||
- Removed all libtoolize bad magic and wrong rpath in favour of pristine source.
|
||||
- TODO: See if any doc is available to bindings.
|
||||
- Uploading package ./kdebindings
|
||||
|
||||
+ Laurent Montel <lmontel@mandriva.com>
|
||||
- Use macro
|
||||
Apply patch from neoclust to generate menu entry
|
||||
- Fix upgrade
|
||||
- 3.5.2
|
||||
- Active debug for cooker only
|
||||
- Add patch from trem <trem@zarb.org> to build on x86_64
|
||||
- Forgot to commit it
|
||||
- 3.5.0
|
||||
Remove conflict
|
||||
- Fix typo
|
||||
* Wed Nov 02 2005 Laurent MONTEL <lmontel@mandriva.com> 3.3.5-3mdk
|
||||
- Rebuild with new mysql
|
||||
* Thu Oct 27 2005 Helio Chissini de Castro <helio@mandriva.com> 3.3.5-2mdk
|
||||
- New immodule patch
|
||||
- 3.4.92
|
||||
- Fix compile
|
||||
- remove qtc and qtsharp from spec
|
||||
- buildrequires openssl-devel
|
||||
Patch from mpol@mandriva.org
|
||||
- Add build requires openssl-devel to fix MDV #17275
|
||||
|
||||
+ Andreas Hasenack <andreas@mandriva.com>
|
||||
- renamed mdv to packages because mdv is too generic and it's hosting only packages anyway
|
||||
|
||||
* Thu Apr 21 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-4mdk
|
||||
- Fix provides
|
||||
|
||||
* Tue Apr 19 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-3mdk
|
||||
- Fix BuildRequires/Compile on x86_64 (thanks Nicolas Chipaux)
|
||||
|
||||
* Sun Apr 17 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-2mdk
|
||||
- Rebuild
|
||||
|
||||
* Fri Apr 15 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-1mdk
|
||||
- 3.4.0
|
||||
- --enable-new-ldflags
|
||||
|
||||
* Fri Mar 18 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-1mdk
|
||||
- 3.3.2
|
||||
|
||||
* Mon Feb 07 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-1mdk
|
||||
- 3.3.2
|
||||
|
||||
* Thu Dec 02 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-3mdk
|
||||
- 3.3.2
|
||||
|
||||
* Fri Oct 22 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-2mdk
|
||||
- Sync with CVS
|
||||
|
||||
* Sat Oct 09 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-1mdk
|
||||
- 3.3.1
|
||||
|
||||
* Sat Sep 11 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-9mdk
|
||||
- Remove last mono buildRequires
|
||||
|
||||
* Wed Sep 08 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-8mdk
|
||||
- Remove unused BuildRequires
|
||||
|
||||
* Fri Aug 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-7mdk
|
||||
- Remove unused patch
|
||||
|
||||
* Fri Aug 13 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-6mdk
|
||||
- Disable compile for mono
|
||||
|
||||
* Wed Aug 11 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-5mdk
|
||||
- Fix add/remove debug
|
||||
|
||||
* Wed Jul 28 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-4mdk
|
||||
- Fix spec file
|
||||
|
||||
* Thu Jul 22 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-3mdk
|
||||
- Fix remove rpath
|
||||
|
||||
* Wed Jul 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-2mdk
|
||||
- Obsoletes smokeqt
|
||||
|
||||
* Tue Jun 15 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-1mdk
|
||||
- 3.2.3
|
||||
|
||||
* Tue Apr 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.1-2mdk
|
||||
- 3.2.2
|
||||
|
||||
* Wed Apr 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.1-2mdk
|
||||
- Fix spec file to using rpmbuildupdate
|
||||
|
||||
* Sat Apr 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.1-1mdk
|
||||
- 3.2.1
|
||||
|
||||
* Wed Mar 31 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-2mdk
|
||||
- Use %%configure
|
||||
- Use mdkversion
|
||||
|
||||
* Tue Feb 24 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-1mdk
|
||||
- 3.2
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
--- kdebindings-3.5.7/dcopperl/Makefile.PL.in.orig 2007-05-29 00:43:13.000000000 -0400
|
||||
+++ kdebindings-3.5.7/dcopperl/Makefile.PL.in 2007-05-29 00:45:53.000000000 -0400
|
||||
@@ -8,6 +8,7 @@
|
||||
my $kde_lib = "@kde_libraries@";
|
||||
my $qt_inc = "@qt_includes@";
|
||||
my $qt_lib = "@qt_libraries@";
|
||||
+my $mandir = "@mandir@";
|
||||
|
||||
WriteMakefile(
|
||||
NAME => 'DCOP',
|
||||
@@ -17,6 +18,7 @@
|
||||
XS => {'DCOP.xs' => 'DCOP.cpp'},
|
||||
XSOPT => '-C++',
|
||||
CCFLAGS => '-x c++',
|
||||
+ INSTALLSITEMAN3DIR => "$mandir/man3/",
|
||||
);
|
||||
|
||||
sub MY::xs_c {
|
||||
@ -1,43 +0,0 @@
|
||||
--- kdebindings-3.5.7/kdejava/koala/kdejava/Makefile.am.orig 2007-08-15 10:31:51.000000000 +0200
|
||||
+++ kdebindings-3.5.7/kdejava/koala/kdejava/Makefile.am 2007-08-15 10:32:10.000000000 +0200
|
||||
@@ -30,7 +30,7 @@
|
||||
# of your shared lib (published for the users)
|
||||
noinst_HEADERS = KDESupport.h KDEJavaSlot.h
|
||||
|
||||
-libkdejava_la_LDFLAGS = $(all_libraries) -no-undefined -version-info $(SOMAJOR):$(SOMINOR):$(SOSUBMINOR)
|
||||
+libkdejava_la_LDFLAGS = $(all_libraries) -no-undefined -module -avoid-version
|
||||
|
||||
libkdejava_la_LIBADD = $(top_builddir)/qtjava/javalib/qtjava/libqtjavasupport.la -lkmdi $(LIB_KHTML) $(LIB_KSPELL) $(LIB_KIO)
|
||||
|
||||
--- kdebindings-3.5.7/qtjava/javalib/qtjava/Makefile.am.orig 2007-08-15 10:37:14.000000000 +0200
|
||||
+++ kdebindings-3.5.7/qtjava/javalib/qtjava/Makefile.am 2007-08-15 10:37:39.000000000 +0200
|
||||
@@ -30,6 +30,6 @@
|
||||
libqtjavasupport_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0
|
||||
libqtjavasupport_la_LIBADD = $(LIB_QT)
|
||||
|
||||
-libqtjava_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 1:0:0
|
||||
+libqtjava_la_LDFLAGS = $(all_libraries) -no-undefined -module -avoid-version
|
||||
libqtjava_la_LIBADD = $(LIB_QT) libqtjavasupport.la
|
||||
|
||||
--- kdebindings-3.5.7/qtjava/javalib/Makefile.am.orig 2007-08-16 02:48:24.000000000 +0200
|
||||
+++ kdebindings-3.5.7/qtjava/javalib/Makefile.am 2007-08-16 02:48:42.000000000 +0200
|
||||
@@ -18,7 +18,7 @@
|
||||
|
||||
|
||||
data_DATA = qtjava.jar
|
||||
-datadir = $(kde_libraries)/java
|
||||
+datadir = $(prefix)/lib/java
|
||||
|
||||
qtjava.jar: org/kde/qt/classnoinst.stamp
|
||||
$(JAR) cf qtjava.jar org/kde/qt/*.class
|
||||
--- kdebindings-3.5.7/kdejava/koala/Makefile.am.orig 2007-08-16 02:49:22.000000000 +0200
|
||||
+++ kdebindings-3.5.7/kdejava/koala/Makefile.am 2007-08-16 02:49:39.000000000 +0200
|
||||
@@ -25,7 +25,7 @@
|
||||
# kde_wallpaperdir Where general wallpapers should go to.
|
||||
|
||||
data_DATA = koala.jar
|
||||
-datadir = $(kde_libraries)/java
|
||||
+datadir = $(prefix)/lib/java
|
||||
|
||||
koala.jar: org/kde/koala/classnoinst.stamp
|
||||
$(JAR) cf koala.jar org/kde/koala/*.class
|
||||
@ -1,29 +0,0 @@
|
||||
--- kdebindings-3.5.7/kdejava/koala/org/kde/koala/KConfig.java.orig 2007-08-15 09:04:00.000000000 +0200
|
||||
+++ kdebindings-3.5.7/kdejava/koala/org/kde/koala/KConfig.java 2007-08-15 09:04:30.000000000 +0200
|
||||
@@ -117,7 +117,7 @@
|
||||
@see #a
|
||||
@see #description
|
||||
@see #of
|
||||
- @see <code></code>@see #mode
|
||||
+ @see #mode
|
||||
*/
|
||||
public native void setFileWriteMode(int mode);
|
||||
/**
|
||||
--- kdebindings-3.5.7/kdejava/koala/org/kde/koala/KMdi.java.orig 2007-08-15 09:05:12.000000000 +0200
|
||||
+++ kdebindings-3.5.7/kdejava/koala/org/kde/koala/KMdi.java 2007-08-15 09:06:08.000000000 +0200
|
||||
@@ -14,7 +14,6 @@
|
||||
@short extent Qt events
|
||||
@see org.kde.qt.QCustomEvent
|
||||
@see org.kde.qt.QEvent#User
|
||||
- @see <pre>
|
||||
@see #boolean
|
||||
@see B_MyWidget#event(
|
||||
@see org.kde.qt.QEvent*
|
||||
@@ -23,7 +22,6 @@
|
||||
@see #e#type
|
||||
@see org.kde.qt.QEvent#Type(QEvent#User
|
||||
@see #int(KMdi#EV_Move)))
|
||||
- @see </pre>
|
||||
*/
|
||||
public static final int EV_Move = 1;
|
||||
public static final int EV_DragBegin = 2;
|
||||
@ -1,66 +0,0 @@
|
||||
2009-12-10 Stepan Kasal <skasal@redhat.com>
|
||||
|
||||
The change of implementation of AC_REQUIRE in 2.64 caused a regression
|
||||
in the arts project.
|
||||
This can be fixed by shuffling some macro calls.
|
||||
|
||||
I suppose that most of this patch will not be needed with a future
|
||||
release of Autoconf.
|
||||
But the last chunk of this patch is a real bug in this source and
|
||||
should go upstream.
|
||||
|
||||
--- arts-1.5.10/admin/acinclude.m4.in 2008-08-20 18:07:05.000000000 +0200
|
||||
+++ arts-1.5.10/admin/acinclude.m4.in 2009-12-09 17:30:57.000000000 +0100
|
||||
@@ -3081,8 +3081,18 @@
|
||||
fi
|
||||
])
|
||||
|
||||
+AC_DEFUN([AC_CHECK_COMPILERS_CC],
|
||||
+[
|
||||
+ dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
|
||||
+ CFLAGS=" $CFLAGS"
|
||||
+ AC_PROG_CC
|
||||
+ CXXFLAGS=" $CXXFLAGS"
|
||||
+ AC_PROG_CXX
|
||||
+])
|
||||
+
|
||||
AC_DEFUN([AC_CHECK_COMPILERS],
|
||||
[
|
||||
+ AC_REQUIRE([AC_CHECK_COMPILERS_CC])
|
||||
AC_ARG_ENABLE(debug,
|
||||
AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
|
||||
[
|
||||
@@ -3141,11 +3151,6 @@
|
||||
[kde_use_profiling="no"]
|
||||
)
|
||||
|
||||
- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
|
||||
- CFLAGS=" $CFLAGS"
|
||||
-
|
||||
- AC_PROG_CC
|
||||
-
|
||||
AC_PROG_CPP
|
||||
|
||||
if test "$GCC" = "yes"; then
|
||||
@@ -3174,10 +3179,6 @@
|
||||
LDFLAGS=""
|
||||
fi
|
||||
|
||||
- CXXFLAGS=" $CXXFLAGS"
|
||||
-
|
||||
- AC_PROG_CXX
|
||||
-
|
||||
KDE_CHECK_FOR_BAD_COMPILER
|
||||
|
||||
if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
|
||||
@@ -3503,8 +3504,8 @@
|
||||
AC_REQUIRE([AC_LIBTOOL_DLOPEN])
|
||||
AC_REQUIRE([KDE_CHECK_LIB64])
|
||||
|
||||
-AC_OBJEXT
|
||||
-AC_EXEEXT
|
||||
+AC_REQUIRE([AC_OBJEXT])
|
||||
+AC_REQUIRE([AC_EXEEXT])
|
||||
|
||||
AM_PROG_LIBTOOL
|
||||
AC_LIBTOOL_CXX
|
||||
@ -1,564 +0,0 @@
|
||||
%define _requires_exceptions devel\(libdns_sd\(.*\)\\|devel\(libdns_sd\)
|
||||
|
||||
%define compile_apidox 1
|
||||
%{?_no_apidox: %{expand: %%global compile_apidox 0}}
|
||||
|
||||
%define lib_major 1
|
||||
%define lib_name_orig libkdegames
|
||||
%define lib_name %mklibname kde3-kdegames %{lib_major}
|
||||
%define lib_oname %mklibname kdegames %{lib_major}
|
||||
%define oname kdegames
|
||||
%define rname kdegames3
|
||||
|
||||
Name: kde3-%{oname}
|
||||
Summary: KDE3 - Games
|
||||
Version: 3.5.12
|
||||
Release: %mkrel 1
|
||||
Epoch: 1
|
||||
Group: Graphical desktop/KDE3
|
||||
License: GPL
|
||||
URL: http://www.kde.org
|
||||
Source: %{oname}-%version.tar.bz2
|
||||
Patch0: kdegames-3.5.8-add-support-avahi.patch
|
||||
Patch1: kde-3.5.10-acinclude.patch
|
||||
#Patch2: fix_autotools.patch
|
||||
Patch3: kdebase-3.5.12-move-xdg-menu-dir.patch
|
||||
Patch4: kdebase-3.5.12-config.patch
|
||||
|
||||
BuildRequires: kde3-macros
|
||||
BuildRequires: X11-devel
|
||||
BuildRequires: freetype2-devel
|
||||
BuildRequires: kdelibs3-devel
|
||||
BuildRequires: alsa-lib-devel
|
||||
BuildRequires: arts3-devel
|
||||
BuildRequires: audiofile-devel
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: jpeg-devel
|
||||
BuildRequires: lcms-devel
|
||||
BuildRequires: mng-devel
|
||||
BuildRequires: png-devel
|
||||
BuildRequires: qt3-devel
|
||||
BuildRequires: libz-devel
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
BuildRequires: automake >= 1.7
|
||||
%else
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
BuildRequires: automake >= 1.11
|
||||
%endif
|
||||
BuildRequires: qt3-doc
|
||||
BuildRequires: avahi-compat-libdns_sd-devel
|
||||
BuildRequires: mesaglu-devel
|
||||
BuildRequires: libx11-devel
|
||||
%if %compile_apidox
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: graphviz
|
||||
%endif
|
||||
Requires: %{lib_name} = %epoch:%version-%release
|
||||
Suggests: %name-atlantik
|
||||
Suggests: %name-kasteroids
|
||||
Suggests: %name-katomic
|
||||
Suggests: %name-kbackgammon
|
||||
Suggests: %name-kbattleship
|
||||
Suggests: %name-kblackbox
|
||||
Suggests: %name-kbounce
|
||||
Suggests: %name-kenolaba
|
||||
Suggests: %name-kfouleggs
|
||||
Suggests: %name-kgoldrunner
|
||||
Suggests: %name-kjumpingcube
|
||||
Suggests: %name-klickety
|
||||
Suggests: %name-klines
|
||||
Suggests: %name-kmahjongg
|
||||
Suggests: %name-kmines
|
||||
Suggests: %name-knetwalk
|
||||
Suggests: %name-kolf
|
||||
Suggests: %name-konquest
|
||||
Suggests: %name-kpat
|
||||
Suggests: %name-kpoker
|
||||
Suggests: %name-kreversi
|
||||
Suggests: %name-ksame
|
||||
Suggests: %name-kshisen
|
||||
Suggests: %name-ksirtet
|
||||
Suggests: %name-ksmiletris
|
||||
Suggests: %name-ksnake
|
||||
Suggests: %name-ksokoban
|
||||
Suggests: %name-kspaceduel
|
||||
Suggests: %name-ktron
|
||||
Suggests: %name-ktuberling
|
||||
Suggests: %name-kwin4
|
||||
Suggests: %name-libs
|
||||
Suggests: %name-lskat
|
||||
%if %mdkversion < 200900
|
||||
Requires(post): desktop-file-utils
|
||||
Requires(postun): desktop-file-utils
|
||||
%endif
|
||||
Obsoletes: ktron < 1:3.5.9
|
||||
Obsoletes: kjumpingcube < 1:3.5.9
|
||||
Provides: %{oname} = %epoch:%version-%release
|
||||
Obsoletes: %{oname}
|
||||
Provides: %{rname} = %epoch:%version-%release
|
||||
Obsoletes: %{rname}
|
||||
BuildRoot: %_tmppath/%name-%version-%release-root
|
||||
|
||||
%description
|
||||
Games for the K Desktop Environment.
|
||||
This is a compilation of various games for KDE project
|
||||
- atlantik: Monopoly-like board games
|
||||
- kabalone: board game: move 6 pieces from your opponent over the edge
|
||||
- kasteroids: shoot at those nasty asteroids
|
||||
- katomic: build complex atoms with a minimal amount of moves
|
||||
- kbackgammon: play backgammon against a local human player, via a
|
||||
game server or against GNU Backgammon (not included)
|
||||
- kbattleship: battleship game with built-in game server
|
||||
- kblackbox: find atoms in a grid by shooting electrons
|
||||
- kfouleggs: a famous japanese game known as puyo-puyo
|
||||
- kbounce: claim areas and don't get disturbed
|
||||
- kjumpingcube: a tactical game for number-crunchers
|
||||
- klines: place 5 equal pieces together, but wait, there are 3 new ones
|
||||
- mahjongg: a tile laying patience
|
||||
- kmines: the classical mine sweeper
|
||||
- kolf: a golf game
|
||||
- konquest: conquer the planets of your enemy
|
||||
- kpat: several patience card games
|
||||
- kpoker: the game of poker
|
||||
- kreversi: the old reversi board game, also known as othello
|
||||
- ksame: collect pieces of the same color
|
||||
- kshisen: patience game where you take away all pieces
|
||||
- ksirtet: very known if spelt this backwards
|
||||
- ksmiletris: another Tetris-like game
|
||||
- ksnake: don't bite yourself, eat apples!
|
||||
- ksokoban: move all storage boxes into the cabinet
|
||||
- kspaceduel: two player game with shooting spaceships flying around a sun
|
||||
- ktron: like ksnake, but without fruits
|
||||
- ktuberling: kids game: make your own potato (NO french fries!)
|
||||
- kwin4: place 4 pieces in a row
|
||||
- libkdegames: KDE game library used by many of these programs
|
||||
- lskat: lieutnant skat
|
||||
- megami: blackjack card game
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post
|
||||
%update_menus
|
||||
%{update_desktop_database}
|
||||
%update_icon_cache crystalsvg
|
||||
%update_icon_cache hicolor
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun
|
||||
%clean_menus
|
||||
%{clean_desktop_database}
|
||||
%clean_icon_cache crystalsvg
|
||||
%clean_icon_cache hicolor
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc %_kde3_docdir/HTML/en/*/*
|
||||
%exclude %_kde3_docdir/HTML/en/kdegames-%version-apidocs
|
||||
%attr(0755,root,root) %_kde3_bindir/*
|
||||
%dir %_kde3_datadir/applications/kde/
|
||||
%_kde3_datadir/applications/kde/*.desktop
|
||||
%_kde3_appsdir/*/*
|
||||
%dir %_kde3_datadir/mimelnk/application/
|
||||
%_kde3_datadir/mimelnk/application/*.desktop
|
||||
%dir %_kde3_datadir/services/
|
||||
%_kde3_datadir/services/*.protocol
|
||||
%dir %_kde3_datadir/config/magic
|
||||
%_kde3_datadir/config/magic/*.magic
|
||||
%_kde3_iconsdir/*/*/*/*
|
||||
%dir %_kde3_datadir/config.kcfg/
|
||||
%_kde3_datadir/config.kcfg/*.kcfg
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
%package -n %lib_name-devel
|
||||
Summary: Headers files for kdegames
|
||||
Group: Development/KDE and Qt
|
||||
Requires: %lib_name = %epoch:%version-%release
|
||||
|
||||
Obsoletes: kdegames3-devel < 1:3.5.9
|
||||
Provides: kde3-kdegames3-devel = %epoch:%version-%release
|
||||
|
||||
Obsoletes: kdegames-devel < 1:3.5.9
|
||||
Provides: kde3-kdegames-devel = %epoch:%version-%release
|
||||
Provides: %lib_name_orig-devel = %epoch:%version-%release
|
||||
|
||||
%description -n %lib_name-devel
|
||||
Headers files needed to build applications based on kdegames applications.
|
||||
|
||||
%files -n %lib_name-devel
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_includedir/*
|
||||
%_kde3_libdir/*.so
|
||||
%_kde3_libdir/*.la
|
||||
%if %compile_apidox
|
||||
%doc %_kde3_docdir/HTML/en/kdegames-%version-apidocs/*
|
||||
%endif
|
||||
%exclude %_kde3_libdir/libkdeinit_*.so
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
%package -n %lib_name
|
||||
Group: System/Libraries
|
||||
Summary: Libraries for kdegame
|
||||
Provides: %lib_name_orig = %epoch:%version-%release
|
||||
Conflicts: kdegames <= 3.1-11mdk
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n %lib_name -p /sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %lib_name -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%description -n %lib_name
|
||||
Libraries for the K Desktop Environment.
|
||||
|
||||
%files -n %lib_name
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_libdir/*.la
|
||||
%_kde3_libdir/*.so.*
|
||||
%_kde3_libdir/libkdeinit_*.so
|
||||
%_kde3_libdir/kde3/*
|
||||
|
||||
#---------------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q -n kdegames-%version
|
||||
%patch0 -p0 -b .add_avahi_support
|
||||
%patch3 -p0
|
||||
%patch4 -p0
|
||||
|
||||
%build
|
||||
PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
|
||||
export xdg_menudir=%_sysconfdir/xdg/kde/menus
|
||||
|
||||
make -f admin/Makefile.common cvs
|
||||
|
||||
%configure_kde3 \
|
||||
--with-extra-includes=/usr/include/avahi-compat-libdns_sd/:/opt/kde3/include/tqt \
|
||||
--with-extra-libs=/opt/kde3/lib
|
||||
%make
|
||||
|
||||
%if %compile_apidox
|
||||
make apidox
|
||||
%endif
|
||||
|
||||
|
||||
%install
|
||||
rm -fr %buildroot
|
||||
|
||||
%makeinstall_std
|
||||
|
||||
%clean
|
||||
rm -fr %buildroot
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jul 21 2011 Tim Williams <tim@my-place.org.uk> 3.5.12-1mvt2010.2
|
||||
+ Update to use Trinity sources
|
||||
+ Add xdg dirs patch
|
||||
+ Add kdebase-3.5.12-config.patch
|
||||
|
||||
* Mon Jul 19 2010 Tim Williams <tim@my-place.org.uk> 3.5.10-6mvt2010.0
|
||||
+ Rebuild for MDV 2010.1
|
||||
+ Add patches from Atilla ÖNTAŞ <atilla_ontas@mandriva.org> branch (this
|
||||
refused to work due to packaging errors, reverting to the original
|
||||
packaging structure)
|
||||
+ KDE builds with autoconf 2.65, add patch for this and
|
||||
set autoconf to version 2.65:patch4
|
||||
+ Fix automake 1.11 issue:patch5
|
||||
+ Rename package to avoid KDE4 conflicts
|
||||
|
||||
* Fri Nov 13 2009 Tim Williams <tim@my-place.org.uk> 1:3.5.10-3mdv2010.0
|
||||
+ Rebuild for MDV 2010.0
|
||||
|
||||
* Thu Apr 02 2009 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.10-2mdv2009.1
|
||||
+ Revision: 363578
|
||||
- Bump release
|
||||
- Pushing back kde3 kdegames :-/
|
||||
|
||||
|
||||
* Fri Aug 29 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.10-1mdv2009.0
|
||||
+ Revision: 277475
|
||||
- Update for last kde3 updates
|
||||
|
||||
* Fri Aug 08 2008 Thierry Vignaud <tvignaud@mandriva.com> 1:3.5.9-7mdv2009.0
|
||||
+ Revision: 267777
|
||||
- rebuild early 2009.0 package (before pixel changes)
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
|
||||
|
||||
* Wed Jun 11 2008 Funda Wang <fundawang@mandriva.org> 1:3.5.9-6mdv2009.0
|
||||
+ Revision: 218010
|
||||
- rebuild for new ldflags
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
|
||||
|
||||
* Mon May 19 2008 Rodrigo Gonçalves de Oliveira <rodrigo@mandriva.com> 1:3.5.9-5mdv2009.0
|
||||
+ Revision: 209007
|
||||
- User versioned obsoletes
|
||||
|
||||
* Wed May 07 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-4mdv2009.0
|
||||
+ Revision: 202889
|
||||
- Move for /opt
|
||||
|
||||
* Sat Mar 22 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.9-2mdv2008.1
|
||||
+ Revision: 189493
|
||||
- Fix groups ( tks to pterjan)
|
||||
|
||||
* Fri Feb 15 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-1mdv2008.1
|
||||
+ Revision: 169010
|
||||
- Get away from branches. Last KDE 3 arriving !!
|
||||
|
||||
* Wed Feb 13 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 1:3.5.8-5mdv2008.1
|
||||
+ Revision: 167148
|
||||
- Removing knetwalk doc files, cause it was added in the wrong place.
|
||||
|
||||
* Wed Feb 13 2008 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 1:3.5.8-4mdv2008.1
|
||||
+ Revision: 167134
|
||||
- Adding pt_BR docbook
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
* Sat Dec 29 2007 Funda Wang <fundawang@mandriva.org> 1:3.5.8-3mdv2008.1
|
||||
+ Revision: 139068
|
||||
- rebuild
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- [FEATURE] Show kdegames in other WM than KDE ( Bug #35868)
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
|
||||
* Sun Oct 28 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.8-1mdv2008.1
|
||||
+ Revision: 102782
|
||||
- Kde 3.5.8
|
||||
Rediff patches
|
||||
|
||||
* Fri Aug 10 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.7-3mdv2008.0
|
||||
+ Revision: 61629
|
||||
- Fix categories and add some OnlyShowIn
|
||||
|
||||
* Mon May 21 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-2mdv2008.0
|
||||
+ Revision: 29259
|
||||
- kdeinit libraries are modules, not development libraries. Moving for proper package
|
||||
|
||||
* Wed May 16 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-1mdv2008.0
|
||||
+ Revision: 27454
|
||||
- 3.5.7 release
|
||||
- Removed old related icons to debian like menu
|
||||
|
||||
|
||||
* Thu Feb 01 2007 Laurent Montel <lmontel@mandriva.com> 3.5.6-1mdv2007.0
|
||||
+ Revision: 115845
|
||||
- 3.5.6
|
||||
|
||||
* Thu Dec 21 2006 Laurent Montel <lmontel@mandriva.com> 1:3.5.5-5mdv2007.1
|
||||
+ Revision: 100932
|
||||
- Fix typo found by Blino
|
||||
- Fix spec file
|
||||
|
||||
* Fri Nov 03 2006 Laurent Montel <lmontel@mandriva.com> 1:3.5.5-3mdv2007.1
|
||||
+ Revision: 76072
|
||||
- Rebuild
|
||||
|
||||
* Thu Oct 26 2006 Laurent Montel <lmontel@mandriva.com> 1:3.5.5-2mdv2007.1
|
||||
+ Revision: 72785
|
||||
- Rebuild
|
||||
- 3.5.5
|
||||
- New version (2006/08/03 3.5.4-1mdv)
|
||||
- compile under x86_64
|
||||
- Use macro
|
||||
- 3.5.3
|
||||
- Rebuild against new xorg
|
||||
- Rebuild to generate category
|
||||
- 3.5.2
|
||||
- Fix build on mdk <=2006
|
||||
- Fix spec file
|
||||
Fix avahi support
|
||||
- kde3.5.1
|
||||
- MDK9.2 is obsolete now
|
||||
- Fix spec file (bug found by nicolas Chipaux)
|
||||
- Add support for avahi
|
||||
- Fix twice kgoldrunner bug found by Nicolas Chipaux
|
||||
- Use avahi
|
||||
- Fix spec file
|
||||
- Real 3.5.0
|
||||
- 3.5.0 (named rc1)
|
||||
- Fix spec file
|
||||
- 3.4.92
|
||||
- Rebuild
|
||||
- New sync to fix kmines program
|
||||
Clean spec file
|
||||
Use --libsuffix
|
||||
- Forgot to increase version number
|
||||
- Add diff
|
||||
Use %%mkrel
|
||||
Fix attribute
|
||||
- Fix attribute of file
|
||||
TODO search why it's suid by default
|
||||
- Fix group
|
||||
- 3.4.2
|
||||
|
||||
+ Andreas Hasenack <andreas@mandriva.com>
|
||||
- renamed mdv to packages because mdv is too generic and it's hosting only packages anyway
|
||||
|
||||
+ Helio Chissini de Castro <helio@mandriva.com>
|
||||
- We are Mandriva now
|
||||
- Increase release number
|
||||
- Fixed klickety bug http://qa.mandriva.com/show_bug.cgi?id=17295. No bindir files must be suid root.
|
||||
- Uploading package ./kdegames
|
||||
|
||||
* Tue May 17 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-6mdk
|
||||
- Rebuild for missing package
|
||||
|
||||
* Sat May 07 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-5mdk
|
||||
- Sync with CVS
|
||||
|
||||
* Fri May 06 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-4mdk
|
||||
- Rebuild
|
||||
|
||||
* Mon Apr 18 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-3mdk
|
||||
- Fix depend
|
||||
|
||||
* Sat Apr 16 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-2mdk
|
||||
- Use --enable-new-ldflags
|
||||
- Reactivate debug
|
||||
- Change email
|
||||
- Reactivate -fvisibility same as for ppc
|
||||
|
||||
* Tue Apr 05 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.4.0-1mdk
|
||||
- 3.4.0
|
||||
|
||||
* Mon Feb 21 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-8mdk
|
||||
- Add patch4: fix kbounce kde bug #96841
|
||||
|
||||
* Fri Feb 18 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-7mdk
|
||||
- Fix export
|
||||
|
||||
* Thu Feb 10 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-6mdk
|
||||
- Disable debug
|
||||
|
||||
* Fri Jan 28 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-5mdk
|
||||
- Add patch3: fix atlantik url
|
||||
|
||||
* Mon Jan 24 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-4mdk
|
||||
- Disable visibility for ppc
|
||||
|
||||
* Tue Jan 11 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-3mdk
|
||||
- Use -f visibility
|
||||
|
||||
* Thu Dec 09 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-2mdk
|
||||
- Fix menu
|
||||
|
||||
* Tue Nov 30 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-1mdk
|
||||
- 3.3.2
|
||||
|
||||
* Mon Nov 15 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-6mdk
|
||||
- Requires arts
|
||||
|
||||
* Thu Oct 28 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-5mdk
|
||||
- Bye-bye %%buildfor
|
||||
|
||||
* Wed Oct 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-4mdk
|
||||
- Sync with CVS
|
||||
|
||||
* Sat Oct 16 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-3mdk
|
||||
- Fix spec file
|
||||
|
||||
* Tue Oct 12 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-2mdk
|
||||
- Deprecated mdk < 9.2
|
||||
|
||||
* Sat Oct 09 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-1mdk
|
||||
- 3.3.1
|
||||
|
||||
* Fri Sep 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-1mdk
|
||||
- 3.3..0
|
||||
|
||||
* Sat Aug 14 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-9mdk
|
||||
- Rebuild for new menu translation tabl
|
||||
|
||||
* Sat Aug 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-8mdk
|
||||
- Remove debug
|
||||
|
||||
* Wed Aug 04 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-7mdk
|
||||
- Fix spec file
|
||||
|
||||
* Thu Jul 22 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-5mdk
|
||||
- Fix remove rpath
|
||||
|
||||
* Sat Jul 10 2004 Laurent Montel <lmontel@mandrakesoft.com> 3.2.3-4mdk
|
||||
- generate doc
|
||||
|
||||
* Wed Jul 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-3mdk
|
||||
- Rebuild with new kdelibs
|
||||
|
||||
* Wed Jun 30 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-2mdk
|
||||
- Sync with CVS
|
||||
|
||||
* Tue Jun 15 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-1mdk
|
||||
- 3.2.3
|
||||
|
||||
* Fri Jun 04 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-4mdk
|
||||
- Rebuild
|
||||
|
||||
* Wed Jun 02 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-3mdk
|
||||
- rebuild with debug
|
||||
|
||||
* Fri May 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-2mdk
|
||||
- Rebuild again qt 3.3.2
|
||||
|
||||
* Tue Apr 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-1mdk
|
||||
- 3.2.2
|
||||
|
||||
* Wed Apr 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.1-2mdk
|
||||
- Fix spec file for using rpmbuildupdate
|
||||
|
||||
* Sat Apr 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.1-1mdk
|
||||
- 3.2.1
|
||||
|
||||
* Wed Mar 31 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-10mdk
|
||||
- Use %%configure
|
||||
- Use mdkversion
|
||||
|
||||
* Thu Mar 11 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-9mdk
|
||||
- Fix bug #77170
|
||||
|
||||
* Fri Mar 05 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-8mdk
|
||||
- Fix Group
|
||||
- Fix epoch
|
||||
|
||||
* Mon Feb 23 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-7mdk
|
||||
- Sync with CVS
|
||||
|
||||
* Mon Feb 16 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-6mdk
|
||||
- Fix katomic bug
|
||||
|
||||
* Mon Feb 16 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-5mdk
|
||||
- Rebuild with good kdedesktop2mdkmenu.pl
|
||||
|
||||
* Thu Feb 12 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-4mdk
|
||||
- Sync with CVS
|
||||
|
||||
* Tue Feb 10 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-3mdk
|
||||
- Sync with CVS
|
||||
|
||||
* Mon Feb 09 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-2mdk
|
||||
- Fix pb into spec file (distint)
|
||||
|
||||
* Tue Feb 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-1mdk
|
||||
- 3.2
|
||||
|
||||
* Mon Feb 02 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-0.2mdk
|
||||
- Sync with CVS
|
||||
|
||||
@ -1,60 +0,0 @@
|
||||
--- libkdegames/Makefile.am~ 2005-09-10 10:18:23.000000000 +0200
|
||||
+++ libkdegames/Makefile.am 2007-10-28 11:43:41.000000000 +0100
|
||||
@@ -2,7 +2,7 @@
|
||||
lib_LTLIBRARIES = libkdegames.la
|
||||
libkdegames_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 3:0:2
|
||||
libkdegames_la_LIBADD = highscore/libkhighscore.la kgame/libkgame.la kgame/dialogs/libkgamedialogs.la \
|
||||
- $(LIB_KSYCOCA) $(LIB_KDNSSD)
|
||||
+ $(LIB_KSYCOCA) $(LIB_KDNSSD) $(AVAHI_LIBS)
|
||||
|
||||
libkdegames_la_SOURCES = kcarddialog.cpp kstdgameaction.cpp \
|
||||
kgamemisc.cpp kchatbase.cpp kchat.cpp \
|
||||
--- atlantik/client/Makefile.am~ 2005-09-10 10:18:18.000000000 +0200
|
||||
+++ atlantik/client/Makefile.am 2007-10-28 11:45:33.000000000 +0100
|
||||
@@ -1,7 +1,7 @@
|
||||
bin_PROGRAMS = atlantik
|
||||
INCLUDES = -I$(top_srcdir)/libkdegames -I$(srcdir)/../libatlantic -I$(srcdir)/../libatlantikclient -I$(srcdir)/../libatlantikui $(all_includes)
|
||||
atlantik_LDFLAGS = $(all_libraries) $(KDE_RPATH)
|
||||
-atlantik_LDADD = ../libatlantikui/libatlantikui.la ../libatlantikclient/libatlantikclient.la $(LIB_KDEGAMES) $(LIB_KIO)
|
||||
+atlantik_LDADD = ../libatlantikui/libatlantikui.la $(LIB_KIO) ../libatlantikclient/libatlantikclient.la $(LIB_KDEGAMES) $(AVAHI_LIBS)
|
||||
atlantik_DEPENDENCIES = $(LIB_KDEGAMES_DEP)
|
||||
|
||||
atlantik_SOURCES = atlantik.cpp configdlg.cpp event.cpp eventlogwidget.cpp \
|
||||
--- kbattleship/kbattleship/Makefile.am~ 2007-10-08 11:48:28.000000000 +0200
|
||||
+++ kbattleship/kbattleship/Makefile.am 2007-10-28 11:46:37.000000000 +0100
|
||||
@@ -13,7 +13,7 @@
|
||||
kstatdialog.cpp kbdiagonalshotstrategy.cpp \
|
||||
konnectionhandling.cpp kship.cpp kshiplist.cpp \
|
||||
kbchooserstrategy.cpp kbattleship.cpp main.cpp
|
||||
-kbattleship_LDADD = $(LIB_KDEGAMES) ./dialogs/libkbattleshipdialogs.la $(LIB_KFILE) $(LIB_KDNSSD)
|
||||
+kbattleship_LDADD = $(LIB_KDEGAMES) ./dialogs/libkbattleshipdialogs.la $(LIB_KFILE) $(LIB_KDNSSD) $(AVAHI_LIBS) -lavahi-client
|
||||
kbattleship_COMPILE_FIRST = dialogs/infoDlg.h dialogs/chatDlg.h dialogs/connectDlg.h dialogs/serverDlg.h dialogs/statDlg.h
|
||||
kbattleship_LDFLAGS = $(all_libraries) $(KDE_RPATH)
|
||||
kbattleship_DEPENDENCIES = $(LIB_KDEGAMES_DEP)
|
||||
--- lskat/lskat/Makefile.am~ 2005-09-10 10:18:27.000000000 +0200
|
||||
+++ lskat/lskat/Makefile.am 2007-10-28 11:47:35.000000000 +0100
|
||||
@@ -3,7 +3,7 @@
|
||||
bin_PROGRAMS = lskat
|
||||
lskat_SOURCES = msgdlg.cpp networkdlg.cpp namedlg.cpp KRemoteConnect.cpp KRSocket.cpp KProcessConnect.cpp KMessageEntry.cpp KInteractiveConnect.cpp KInputChildProcess.cpp KEMessage.cpp KEInput.cpp KConnectEntry.cpp KChildConnect.cpp lskatview.cpp lskatdoc.cpp lskat.cpp main.cpp networkdlgbase.ui
|
||||
|
||||
-lskat_LDADD = $(LIB_KFILE) $(LIB_KDEGAMES) $(LIB_KDNSSD)
|
||||
+lskat_LDADD = $(LIB_KFILE) $(LIB_KDEGAMES) $(LIB_KDNSSD) $(AVAHI_LIBS) -lavahi-client
|
||||
lskat_DEPENDENCIES = $(LIB_KDEGAMES_DEP)
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/libkdegames $(all_includes)
|
||||
--- libkdegames/configure.in.in~ 2005-09-10 10:18:23.000000000 +0200
|
||||
+++ libkdegames/configure.in.in 2007-10-28 11:52:04.000000000 +0100
|
||||
@@ -47,3 +47,13 @@
|
||||
highscore_user="$withval",highscore_user="games")
|
||||
AC_SUBST(highscore_user)
|
||||
AC_MSG_RESULT($highscore_user)
|
||||
+
|
||||
+m4_pattern_allow(PKG_CONFIG_MIN_VERSION)
|
||||
+PKG_PROG_PKG_CONFIG
|
||||
+
|
||||
+avahi_found=no
|
||||
+KDE_PKG_CHECK_MODULES(AVAHI, [avahi-qt3 >= 0.4 ],
|
||||
+ [avahi_found=yes],[:])
|
||||
+AC_MSG_RESULT($avahi_found)
|
||||
+AC_SUBST(AVAHI_CFLAGS)
|
||||
+AC_SUBST(AVAHI_LIBS)
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,8 +0,0 @@
|
||||
--- kpdf/shell/kpdf.desktop.orig 2011-07-20 15:12:15.187775862 +0100
|
||||
+++ kpdf/shell/kpdf.desktop 2011-07-20 15:12:56.269776545 +0100
|
||||
@@ -79,4 +79,4 @@
|
||||
DocPath=kpdf/index.html
|
||||
InitialPreference=7
|
||||
Categories=Qt;KDE;Office;Viewer;
|
||||
-
|
||||
+OnlyShowIn=KDE
|
||||
@ -1,29 +0,0 @@
|
||||
--- kgamma/kcmkgamma/xvidextwrap.cpp.orig 2010-08-13 10:03:09.000000000 +0100
|
||||
+++ kgamma/kcmkgamma/xvidextwrap.cpp 2011-07-20 15:25:44.133775992 +0100
|
||||
@@ -16,6 +16,7 @@
|
||||
***************************************************************************/
|
||||
#include <tqnamespace.h>
|
||||
#include <tqevent.h>
|
||||
+#include <tqwindowdefs.h>
|
||||
|
||||
#include <X11/Xos.h>
|
||||
#include <X11/Xlib.h>
|
||||
@@ -47,7 +48,8 @@
|
||||
|
||||
|
||||
XVidExtWrap::XVidExtWrap(bool* OK, const char* displayname) {
|
||||
- if ((dpy = XOpenDisplay(displayname))) {
|
||||
+ dpy = qt_xdisplay();
|
||||
+ if (dpy) {
|
||||
screen = DefaultScreen(dpy);
|
||||
setGammaLimits(0.1, 10.0);
|
||||
*OK = true;
|
||||
@@ -59,7 +61,7 @@
|
||||
}
|
||||
|
||||
XVidExtWrap::~XVidExtWrap() {
|
||||
- if (dpy) XCloseDisplay(dpy);
|
||||
+
|
||||
}
|
||||
|
||||
int XVidExtWrap::_DefaultScreen() {
|
||||
@ -1,52 +0,0 @@
|
||||
--- ksnapshot/ksnapshot.cpp.orig 2007-11-28 22:13:20.000000000 +0800
|
||||
+++ ksnapshot/ksnapshot.cpp 2007-11-28 22:21:29.000000000 +0800
|
||||
@@ -41,6 +41,8 @@
|
||||
#include <tqpainter.h>
|
||||
#include <tqpaintdevicemetrics.h>
|
||||
#include <tqwhatsthis.h>
|
||||
+#include <tqtextcodec.h>
|
||||
+#include <tqtextstream.h>
|
||||
|
||||
#include <stdlib.h>
|
||||
|
||||
@@ -58,6 +60,31 @@
|
||||
|
||||
#define kApp KApplication::kApplication()
|
||||
|
||||
+// helper function for reading xdg user dirs: it is required in order to take
|
||||
+// care of locale stuff
|
||||
+TQString readXdgUserDirs()
|
||||
+{
|
||||
+ TQFile f( TQDir::homeDirPath() + "/.config/user-dirs.dirs" );
|
||||
+
|
||||
+ TQString picturesDir = TQDir::currentDirPath();
|
||||
+ if (!f.open(IO_ReadOnly))
|
||||
+ return(picturesDir);
|
||||
+
|
||||
+ // set the codec for the current locale
|
||||
+ TQTextStream s(&f);
|
||||
+ s.setCodec( TQTextCodec::codecForLocale() );
|
||||
+
|
||||
+ TQString line = s.readLine();
|
||||
+ while (!line.isNull())
|
||||
+ {
|
||||
+ if (line.startsWith("XDG_PICTURES_DIR="))
|
||||
+ picturesDir = line.remove("XDG_PICTURES_DIR=").remove("\"").replace("$HOME", QDir::homeDirPath());
|
||||
+
|
||||
+ line = s.readLine();
|
||||
+ }
|
||||
+ return(picturesDir);
|
||||
+}
|
||||
+
|
||||
KSnapshot::KSnapshot(TQWidget *parent, const char *name, bool grabCurrent)
|
||||
: DCOPObject("interface"),
|
||||
KDialogBase(parent, name, true, TQString::null, Help|User1, User1,
|
||||
@@ -99,7 +126,7 @@
|
||||
mainWidget->setDelay(conf->readNumEntry("delay",0));
|
||||
mainWidget->setMode( conf->readNumEntry( "mode", 0 ) );
|
||||
mainWidget->setIncludeDecorations(conf->readBoolEntry("includeDecorations",true));
|
||||
- filename = KURL::fromPathOrURL( conf->readPathEntry( "filename", TQDir::currentDirPath()+"/"+i18n("snapshot")+"1.png" ));
|
||||
+ filename = KURL::fromPathOrURL( conf->readPathEntry( "filename", readXdgUserDirs()+"/"+i18n("snapshot")+"1.png" ));
|
||||
|
||||
// Make sure the name is not already being used
|
||||
while(KIO::NetAccess::exists( filename, false, this )) {
|
||||
@ -1,35 +0,0 @@
|
||||
--- kdegraphics-3.5.3/kamera/configure.in.in.orig 2006-03-14 11:30:50.000000000 +0100
|
||||
+++ kdegraphics-3.5.3/kamera/configure.in.in 2006-03-14 14:03:48.000000000 +0100
|
||||
@@ -31,14 +31,20 @@
|
||||
|
||||
AC_MSG_CHECKING(for gPhoto2)
|
||||
# the pkg-config way first, if user did not use --with-
|
||||
-AC_CHECK_PROG(gphoto2_config,gphoto2-config,gphoto2-config,no)
|
||||
-AC_CHECK_PROG(gphoto2_port_config,gphoto2-port-config,gphoto2-port-config,no)
|
||||
-if test "$gphoto2_includes" = "" -a "$gphoto2_libraries" = "" -a "$gphoto2_config" != "no" -a "$gphoto2_port_config" != "no"
|
||||
+GPHOTO2_INCS="`pkg-config libgphoto2 --cflags 2>/dev/null`"
|
||||
+GPHOTO2_LIBS="`pkg-config libgphoto2 --libs 2>/dev/null`"
|
||||
+if test "$GPHOTO2_INCS" != "" -a "$GPHOTO2_LIBS" != "" ;
|
||||
then
|
||||
with_kamera="yes"
|
||||
+else
|
||||
+ AC_CHECK_PROG(gphoto2_config,gphoto2-config,gphoto2-config,no)
|
||||
+ AC_CHECK_PROG(gphoto2_port_config,gphoto2-port-config,gphoto2-port-config,no)
|
||||
+ if test "$gphoto2_includes" = "" -a "$gphoto2_libraries" = "" -a "$gphoto2_config" != "no" -a "$gphoto2_port_config" != "no";
|
||||
+ then
|
||||
GPHOTO2_INCS="`$gphoto2_config --cflags` `$gphoto2_port_config --cflags`"
|
||||
GPHOTO2_LIBS="`$gphoto2_config --libs` `$gphoto2_port_config --libs`"
|
||||
-else
|
||||
+ with_kamera="yes"
|
||||
+ else
|
||||
#
|
||||
# Search for gphoto2 include files.
|
||||
#
|
||||
@@ -110,6 +116,7 @@
|
||||
GPHOTO2_INCS="-I$gphoto2_includes"
|
||||
fi
|
||||
fi
|
||||
+ fi
|
||||
fi
|
||||
|
||||
if test "$with_kamera" = "yes" ; then
|
||||
@ -1 +0,0 @@
|
||||
^.(/opt/kde3/lib/.*.so|/opt/kde3/lib/kde3/.*.so)
|
||||
@ -1,2 +0,0 @@
|
||||
#!/bin/sh
|
||||
ldconfig -X
|
||||
@ -1,20 +0,0 @@
|
||||
--- kdelibs-3.3.2/kio/kfile/kurlbar.cpp-- 2004-12-29 16:50:52.814327086 +0100
|
||||
+++ kdelibs-3.3.2/kio/kfile/kurlbar.cpp 2004-12-29 16:52:25.597617064 +0100
|
||||
@@ -90,7 +90,7 @@ KURLBarItem::KURLBarItem( KURLBar *paren
|
||||
m_url( url ),
|
||||
m_pixmap( 0L ),
|
||||
m_parent( parent ),
|
||||
- m_appLocal( true )
|
||||
+ m_appLocal( false )
|
||||
{
|
||||
init( icon, group, description, persistent );
|
||||
}
|
||||
@@ -102,7 +102,7 @@ KURLBarItem::KURLBarItem( KURLBar *paren
|
||||
m_url( url ),
|
||||
m_pixmap( 0L ),
|
||||
m_parent( parent ),
|
||||
- m_appLocal( true )
|
||||
+ m_appLocal( false )
|
||||
{
|
||||
init( icon, group, description, true /*persistent*/ );
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
Submitted By: zippo zippo@oppiz.net
|
||||
Initial Package Version: kdelibs-3.5.8
|
||||
Date: 2007-12-29
|
||||
Upstream Status: Unknown
|
||||
Origin: zippo zippo@oppiz.net
|
||||
Description: Fixes a LDFLAGS and RPATH issued in locating the QT library.
|
||||
|
||||
--- kdelibs-3.5.10/dcop/dcopidl/Makefile.am~ 2008-08-19 21:18:18.000000000 +0300
|
||||
+++ kdelibs-3.5.10/dcop/dcopidl/Makefile.am 2010-02-15 16:13:22.596733866 +0200
|
||||
@@ -11,7 +11,7 @@
|
||||
noinst_HEADERS = yacc.cc.h
|
||||
|
||||
dcopidl_LDADD = $(LIB_QT)
|
||||
-dcopidl_LDFLAGS = $(KDE_RPATH) $(AM_LDFLAGS)
|
||||
+dcopidl_LDFLAGS = $(KDE_LDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS)
|
||||
|
||||
####### Build rules
|
||||
|
||||
--- kdelibs-3.5.10/dcop/dcopidl2cpp/Makefile.am~ 2008-08-19 21:18:18.000000000 +0300
|
||||
+++ kdelibs-3.5.10/dcop/dcopidl2cpp/Makefile.am 2010-02-15 16:13:56.370163020 +0200
|
||||
@@ -10,7 +10,7 @@
|
||||
noinst_HEADERS = main.h
|
||||
|
||||
dcopidl2cpp_LDADD = $(LIB_QT)
|
||||
-dcopidl2cpp_LDFLAGS = $(KDE_RPATH) $(AM_LDFLAGS)
|
||||
+dcopidl2cpp_LDFLAGS = $(KDE_LDFLAGS) $(AM_LDFLAGS) $(QT_LDFLAGS)
|
||||
|
||||
dcopidl_output.kidl: ../dcopidl/dcopidl $(srcdir)/dcopidl_test.h
|
||||
../dcopidl/dcopidl $(srcdir)/dcopidl_test.h > dcopidl_output.kidl
|
||||
@ -1,11 +0,0 @@
|
||||
--- kdelibs-3.5.12/kdeui/ktip.cpp.orig 2011-02-04 11:30:10.042474496 +0000
|
||||
+++ kdelibs-3.5.12/kdeui/ktip.cpp 2011-02-04 11:30:30.506474344 +0000
|
||||
@@ -302,7 +302,7 @@
|
||||
hbox2->addWidget(ok);
|
||||
|
||||
KConfigGroup config(kapp->config(), "TipOfDay");
|
||||
- mTipOnStart->setChecked(config.readBoolEntry("RunOnStart", true));
|
||||
+ mTipOnStart->setChecked(config.readBoolEntry("RunOnStart", false));
|
||||
|
||||
connect(next, TQT_SIGNAL(clicked()), this, TQT_SLOT(nextTip()));
|
||||
connect(prev, TQT_SIGNAL(clicked()), this, TQT_SLOT(prevTip()));
|
||||
@ -1,11 +0,0 @@
|
||||
--- kdelibs-3.5.2/admin/acinclude.m4.in-- 2006-05-03 16:06:13.000000000 +0200
|
||||
+++ kdelibs-3.5.2/admin/acinclude.m4.in 2006-05-03 16:06:22.000000000 +0200
|
||||
@@ -492,7 +492,7 @@
|
||||
xdg_appsdir='\${datadir}/applications/kde'
|
||||
fi
|
||||
if test -z "$xdg_menudir"; then
|
||||
- xdg_menudir='\${sysconfdir}/xdg/menus'
|
||||
+ xdg_menudir='\${sysconfdir}/xdg/kde/menus'
|
||||
fi
|
||||
if test -z "$xdg_directorydir"; then
|
||||
xdg_directorydir='\${datadir}/desktop-directories'
|
||||
@ -1,30 +0,0 @@
|
||||
--- kdelibs-3.5.3/kio/kfile/kpropertiesdialog.cpp.orig 2006-02-03 13:46:21.000000000 -0200
|
||||
+++ kdelibs-3.5.3/kio/kfile/kpropertiesdialog.cpp 2006-07-14 11:11:18.000000000 -0300
|
||||
@@ -2024,6 +2024,7 @@
|
||||
}
|
||||
|
||||
// Draw Checkboxes
|
||||
+ bool allDisable = true;
|
||||
TQCheckBox *cba[3][4];
|
||||
for (int row = 0; row < 3 ; ++row) {
|
||||
for (int col = 0; col < 4; ++col) {
|
||||
@@ -2039,6 +2040,8 @@
|
||||
else if (d->cbRecursive && d->cbRecursive->isChecked())
|
||||
cb->setTristate();
|
||||
|
||||
+ if( d->canChangePermissions)
|
||||
+ allDisable = false;
|
||||
cb->setEnabled( d->canChangePermissions );
|
||||
gl->addWidget (cb, row+2, col+1);
|
||||
switch(col) {
|
||||
@@ -2095,6 +2098,10 @@
|
||||
|
||||
}
|
||||
#endif
|
||||
+
|
||||
+ if ( allDisable )
|
||||
+ dlg.enableButtonOK( false );
|
||||
+
|
||||
if (dlg.exec() != KDialogBase::Accepted)
|
||||
return;
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
--- kdecore/klocale.cpp.orig 2011-02-04 10:59:25.234472351 +0000
|
||||
+++ kdecore/klocale.cpp 2011-02-04 11:01:08.952473215 +0000
|
||||
@@ -138,7 +138,10 @@
|
||||
if (mainCatalogue.contains("desktop") == 0 || mainCatalogue.contains("kdesktop") == 1) { //don't bother if we're looking up desktop translations
|
||||
d->catalogNames.append( SYSTEM_MESSAGES ); // always include kdelibs.mo
|
||||
d->catalogNames.append( "kio" ); // always include kio.mo
|
||||
+ KGlobal::dirs()->addResourceDir("locale", "/usr/share/locale");
|
||||
+ d->catalogNames.append( "kickoff" );
|
||||
d->catalogNames.append( "xdg-user-dirs" );
|
||||
+ d->catalogNames.append( "mandriva-kde-translation" );
|
||||
}
|
||||
updateCatalogues(); // evaluate this for all languages
|
||||
}
|
||||
@ -1,134 +0,0 @@
|
||||
--- kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c.orig 2007-08-23 14:53:00.000000000 -0300
|
||||
+++ kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c 2007-08-23 17:40:02.000000000 -0300
|
||||
@@ -13,6 +13,9 @@
|
||||
static char pwdstring[33];
|
||||
static int cups_local_auth(http_t *http);
|
||||
|
||||
+const char* cupsGetConf( void );
|
||||
+int cupsPutConf( const char* );
|
||||
+
|
||||
const char * /* O - Filename for PPD file */
|
||||
cupsGetConf(void)
|
||||
{
|
||||
@@ -29,6 +32,8 @@
|
||||
char prompt[1024]; /* Prompt string */
|
||||
int digest_tries; /* Number of tries with Digest */
|
||||
static char filename[HTTP_MAX_URI]; /* Local filename */
|
||||
+ char fqdn[ HTTP_MAX_URI ]; /* Server name buffer */
|
||||
+
|
||||
|
||||
/*
|
||||
* Connect to the correct server as needed...
|
||||
@@ -108,15 +113,15 @@
|
||||
* See if we should retry the current digest password...
|
||||
*/
|
||||
|
||||
- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 ||
|
||||
+ if (strncmp( httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE ), "Basic", 5) == 0 ||
|
||||
digest_tries > 1 || !pwdstring[0])
|
||||
{
|
||||
/*
|
||||
* Nope - get a password from the user...
|
||||
*/
|
||||
+ httpGetHostname( cups_server, fqdn, sizeof( fqdn ) );
|
||||
|
||||
- snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
|
||||
- cups_server->hostname);
|
||||
+ snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(), fqdn );
|
||||
|
||||
if ((password = cupsGetPassword(prompt)) == NULL)
|
||||
break;
|
||||
@@ -135,7 +140,7 @@
|
||||
* Got a password; encode it for the server...
|
||||
*/
|
||||
|
||||
- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0)
|
||||
+ if (strncmp( httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE ), "Basic", 5) == 0)
|
||||
{
|
||||
/*
|
||||
* Basic authentication...
|
||||
@@ -210,7 +215,7 @@
|
||||
* OK, we need to copy the file...
|
||||
*/
|
||||
|
||||
- while ((bytes = httpRead(cups_server, buffer, sizeof(buffer))) > 0)
|
||||
+ while ((bytes = httpRead2(cups_server, buffer, sizeof(buffer))) > 0)
|
||||
{
|
||||
write(fd, buffer, bytes);
|
||||
}
|
||||
@@ -235,6 +240,7 @@
|
||||
http_status_t status; /* HTTP status from server */
|
||||
char prompt[1024]; /* Prompt string */
|
||||
int digest_tries; /* Number of tries with Digest */
|
||||
+ char fqdn[ HTTP_MAX_URI ]; /* Server name buffer */
|
||||
|
||||
if (name == NULL)
|
||||
return 0;
|
||||
@@ -305,11 +311,11 @@
|
||||
break;
|
||||
}
|
||||
else
|
||||
- httpWrite(cups_server, buffer, bytes);
|
||||
+ httpWrite2(cups_server, buffer, bytes);
|
||||
|
||||
if (status == HTTP_CONTINUE)
|
||||
{
|
||||
- httpWrite(cups_server, buffer, 0);
|
||||
+ httpWrite2(cups_server, buffer, 0);
|
||||
while ((status = httpUpdate(cups_server)) == HTTP_CONTINUE);
|
||||
}
|
||||
|
||||
@@ -334,15 +340,16 @@
|
||||
* See if we should retry the current digest password...
|
||||
*/
|
||||
|
||||
- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0 ||
|
||||
+ if (strncmp( httpGetField ( cups_server, HTTP_FIELD_WWW_AUTHENTICATE ), "Basic", 5) == 0 ||
|
||||
digest_tries > 1 || !pwdstring[0])
|
||||
{
|
||||
/*
|
||||
* Nope - get a password from the user...
|
||||
*/
|
||||
|
||||
- snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
|
||||
- cups_server->hostname);
|
||||
+
|
||||
+ httpGetHostname( cups_server, fqdn, sizeof( fqdn ) );
|
||||
+ snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(), fqdn );
|
||||
|
||||
if ((password = cupsGetPassword(prompt)) == NULL)
|
||||
break;
|
||||
@@ -361,7 +368,7 @@
|
||||
* Got a password; encode it for the server...
|
||||
*/
|
||||
|
||||
- if (strncmp(cups_server->fields[HTTP_FIELD_WWW_AUTHENTICATE], "Basic", 5) == 0)
|
||||
+ if (strncmp(httpGetField( cups_server, HTTP_FIELD_WWW_AUTHENTICATE ), "Basic", 5) == 0)
|
||||
{
|
||||
/*
|
||||
* Basic authentication...
|
||||
@@ -492,3 +499,4 @@
|
||||
|
||||
return (1);
|
||||
}
|
||||
+
|
||||
--- kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp.orig 2007-08-23 17:56:12.000000000 -0300
|
||||
+++ kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp 2007-08-23 17:57:53.000000000 -0300
|
||||
@@ -310,7 +310,7 @@
|
||||
}
|
||||
|
||||
#ifdef HAVE_CUPS_NO_PWD_CACHE
|
||||
- strncpy( HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE );
|
||||
+ httpSetAuthString( HTTP, NULL, cups_authstring.data() );
|
||||
#endif
|
||||
|
||||
if (dump_ > 0)
|
||||
@@ -320,7 +320,7 @@
|
||||
|
||||
request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" : res.latin1()), (filename.isEmpty() ? NULL : filename.latin1()));
|
||||
#ifdef HAVE_CUPS_NO_PWD_CACHE
|
||||
- cups_authstring = HTTP->authstring;
|
||||
+ cups_authstring = httpGetAuthString( HTTP );
|
||||
#endif
|
||||
httpClose(HTTP);
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- kio/bookmarks/kbookmarkmanager.cc~ 2007-10-06 16:11:19.000000000 +0200
|
||||
+++ kio/bookmarks/kbookmarkmanager.cc 2007-10-06 16:11:19.000000000 +0200
|
||||
@@ -706,7 +706,7 @@
|
||||
config.setGroup("Bookmarks");
|
||||
|
||||
// add bookmark dialog usage - no reparse
|
||||
- s_self->m_advancedaddbookmark = config.readBoolEntry("AdvancedAddBookmarkDialog", false);
|
||||
+ s_self->m_advancedaddbookmark = config.readBoolEntry("AdvancedAddBookmarkDialog", true);
|
||||
|
||||
// these three alter the menu, therefore all need a reparse
|
||||
s_self->m_contextmenu = config.readBoolEntry("ContextMenuActions", true);
|
||||
@ -1,63 +0,0 @@
|
||||
--- kdelibs-3.5.9/kio/kfile/kpropertiesdialog.cpp.orig 2008-02-28 09:52:00.000000000 -0300
|
||||
+++ kdelibs-3.5.9/kio/kfile/kpropertiesdialog.cpp 2008-02-28 10:05:56.000000000 -0300
|
||||
@@ -1771,27 +1771,31 @@
|
||||
strUser = user->pw_name;
|
||||
|
||||
#ifdef Q_OS_UNIX
|
||||
- setgrent();
|
||||
- for (i=0; ((ge = getgrent()) != 0L) && (i < maxEntries); i++)
|
||||
- {
|
||||
- if (IamRoot)
|
||||
- groupList += TQString::fromLatin1(ge->gr_name);
|
||||
- else
|
||||
- {
|
||||
- /* pick the groups to which the user belongs */
|
||||
- char ** members = ge->gr_mem;
|
||||
- char * member;
|
||||
- while ((member = *members) != 0L) {
|
||||
- if (strUser == member) {
|
||||
- groupList += TQString::fromLocal8Bit(ge->gr_name);
|
||||
- break;
|
||||
- }
|
||||
- ++members;
|
||||
- }
|
||||
- }
|
||||
- }
|
||||
- endgrent();
|
||||
-#endif //Q_OS_UNIX
|
||||
+
|
||||
+ gid_t *groups = NULL;
|
||||
+ int ng = 1;
|
||||
+ struct group *mygroup;
|
||||
+ gid_t *newgroups = NULL;
|
||||
+
|
||||
+ groups = (gid_t *) malloc(ng * sizeof(gid_t));
|
||||
+
|
||||
+ if (getgrouplist(strUser, user->pw_gid, groups, &ng) == -1) {
|
||||
+ newgroups = (gid_t *) malloc(ng * sizeof(gid_t));
|
||||
+ if (newgroups != NULL) {
|
||||
+ free(groups);
|
||||
+ groups = newgroups;
|
||||
+ getgrouplist(strUser, user->pw_gid, groups, &ng);
|
||||
+ } else ng = 1;
|
||||
+ }
|
||||
+
|
||||
+ for (i = 0; i < ng; i++) {
|
||||
+ mygroup = getgrgid(groups[i]);
|
||||
+ if (mygroup != NULL) groupList += TQString::fromLocal8Bit(mygroup->gr_name);
|
||||
+ }
|
||||
+
|
||||
+ free(groups);
|
||||
+
|
||||
+#else //Q_OS_UNIX
|
||||
|
||||
/* add the effective Group to the list .. */
|
||||
ge = getgrgid (getegid());
|
||||
@@ -1802,6 +1806,7 @@
|
||||
if (groupList.find(name) == groupList.end())
|
||||
groupList += name;
|
||||
}
|
||||
+#endif //Q_OS_UNIX
|
||||
|
||||
bool isMyGroup = groupList.contains(strGroup);
|
||||
|
||||
Binary file not shown.
@ -1,52 +0,0 @@
|
||||
there appeared some kind of leak or memory overwrite, or double destruct, can't
|
||||
track down where it came from, only thing done (to my knowledge) was to rebuild
|
||||
kde packages due newer dependencies in distro. maybe gcc overoptimizes, but
|
||||
rebuild with gcc 4.4.2 did not help.
|
||||
|
||||
crash happens when kmail send mail window is destructed (you hit send mail
|
||||
button)
|
||||
|
||||
Program received signal SIGSEGV, Segmentation fault.
|
||||
0x00007ffff6dba027 in DCOPObject::~DCOPObject (this=0xdf03b8, __in_chrg=<value optimized out>) at dcopobject.cpp:81
|
||||
81 if ( d->m_signalConnections > 0 && client )
|
||||
(gdb) bt
|
||||
#0 0x00007ffff6dba027 in DCOPObject::~DCOPObject (this=0xdf03b8, __in_chrg=<value optimized out>) at dcopobject.cpp:81
|
||||
#1 0x00007ffff77c6a6b in KMComposeWin::~KMComposeWin (this=0xdefd30, __in_chrg=<value optimized out>, __vtt_parm=<value optimized out>) at kmcomposewin.cpp:490
|
||||
#2 0x00007ffff66b911a in QObject::event(QEvent*) () from /usr/lib64/libqt-mt.so.3
|
||||
#3 0x00007ffff66ee013 in QWidget::event(QEvent*) () from /usr/lib64/libqt-mt.so.3
|
||||
#4 0x00007ffff665a865 in QApplication::internalNotify(QObject*, QEvent*) () from /usr/lib64/libqt-mt.so.3
|
||||
#5 0x00007ffff665b96e in QApplication::notify(QObject*, QEvent*) () from /usr/lib64/libqt-mt.so.3
|
||||
#6 0x00007ffff70aaf28 in KApplication::notify (this=0x7fffffffda10, receiver=0xdefd30, event=0xe72500) at kapplication.cpp:550
|
||||
#7 0x00007ffff665c263 in QApplication::sendPostedEvents(QObject*, int) () from /usr/lib64/libqt-mt.so.3
|
||||
#8 0x00007ffff660acad in QEventLoop::processEvents(unsigned int) () from /usr/lib64/libqt-mt.so.3
|
||||
#9 0x00007ffff6670ba9 in QEventLoop::enterLoop() () from /usr/lib64/libqt-mt.so.3
|
||||
#10 0x00007ffff6670a32 in QEventLoop::exec() () from /usr/lib64/libqt-mt.so.3
|
||||
#11 0x00000000004028cc in main (argc=3, argv=<value optimized out>) at main.cpp:110
|
||||
(gdb) p d
|
||||
$1 = (DCOPObject::DCOPObjectPrivate *) 0x0
|
||||
(gdb) p client
|
||||
$2 = <value optimized out>
|
||||
(gdb) l
|
||||
76 }
|
||||
77
|
||||
78 DCOPObject::~DCOPObject()
|
||||
79 {
|
||||
80 DCOPClient *client = DCOPClient::mainClient();
|
||||
81 if ( d->m_signalConnections > 0 && client )
|
||||
82 client->disconnectDCOPSignal( 0, 0, 0, objId(), 0 );
|
||||
83
|
||||
84 objMap()->remove(ident);
|
||||
85 delete d;
|
||||
(gdb)
|
||||
|
||||
--- kdelibs-3.5.10/dcop/dcopobject.cpp~ 2005-09-10 11:27:23.000000000 +0300
|
||||
+++ kdelibs-3.5.10/dcop/dcopobject.cpp 2010-01-30 07:56:50.818689543 +0200
|
||||
@@ -78,7 +78,7 @@
|
||||
DCOPObject::~DCOPObject()
|
||||
{
|
||||
DCOPClient *client = DCOPClient::mainClient();
|
||||
- if ( d->m_signalConnections > 0 && client )
|
||||
+ if (d && d->m_signalConnections > 0 && client )
|
||||
client->disconnectDCOPSignal( 0, 0, 0, objId(), 0 );
|
||||
|
||||
objMap()->remove(ident);
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,27 +0,0 @@
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIEnDCCBAWgAwIBAgIQdTN9mrDhIzuuLX3kRpFi1DANBgkqhkiG9w0BAQUFADBf
|
||||
MQswCQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xNzA1BgNVBAsT
|
||||
LkNsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
|
||||
HhcNMDUwMTE5MDAwMDAwWhcNMTUwMTE4MjM1OTU5WjCBsDELMAkGA1UEBhMCVVMx
|
||||
FzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJpU2lnbiBUcnVz
|
||||
dCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2UgYXQgaHR0cHM6Ly93d3cu
|
||||
dmVyaXNpZ24uY29tL3JwYSAoYykwNTEqMCgGA1UEAxMhVmVyaVNpZ24gQ2xhc3Mg
|
||||
MyBTZWN1cmUgU2VydmVyIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
|
||||
AQEAlcMhEo5AxQ0BX3ZeZpTZcyxYGSK4yfx6OZAqd3J8HT732FXjr0LLhzAC3Fus
|
||||
cOa4RLQrNeuT0hcFfstG1lxToDJRnXRkWPkMmgDqXkRJZHL0zRDihQr5NO6ziGap
|
||||
paRa0A6Yf1gNK1K7hql+LvqySHyN2y1fAXWijQY7i7RhB8m+Ipn4G9G1V2YETTX0
|
||||
kXGWtZkIJZuXyDrzILHdnpgMSmO3ps6wAc74k2rzDG6fsemEe4GYQeaB3D0s57Rr
|
||||
4578CBbXs9W5ZhKZfG1xyE2+xw/j+zet1XWHIWuG0EQUWlR5OZZpVsm5Mc2JYVjh
|
||||
2XYFBa33uQKvp/1HkaIiNFox0QIDAQABo4IBgTCCAX0wEgYDVR0TAQH/BAgwBgEB
|
||||
/wIBADBEBgNVHSAEPTA7MDkGC2CGSAGG+EUBBxcDMCowKAYIKwYBBQUHAgEWHGh0
|
||||
dHBzOi8vd3d3LnZlcmlzaWduLmNvbS9ycGEwMQYDVR0fBCowKDAmoCSgIoYgaHR0
|
||||
cDovL2NybC52ZXJpc2lnbi5jb20vcGNhMy5jcmwwDgYDVR0PAQH/BAQDAgEGMBEG
|
||||
CWCGSAGG+EIBAQQEAwIBBjApBgNVHREEIjAgpB4wHDEaMBgGA1UEAxMRQ2xhc3Mz
|
||||
Q0EyMDQ4LTEtNDUwHQYDVR0OBBYEFG/sr6DdiqTv9SoQZy0/VYK81+8lMIGABgNV
|
||||
HSMEeTB3oWOkYTBfMQswCQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIElu
|
||||
Yy4xNzA1BgNVBAsTLkNsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlv
|
||||
biBBdXRob3JpdHmCEHC65B0Q2Sk0tjjKewPMur8wDQYJKoZIhvcNAQEFBQADgYEA
|
||||
w34IRl2RNs9n3Nenr6+4IsOLBHTTsWC85v63RBKBWzFzFGNWxnIu0RoDQ1w4ClBK
|
||||
Tc3athmo9JkNr+P32PF1KGX2av6b9L1S2T/L2hbLpZ4ujmZSeD0m+v6UNohKlV4q
|
||||
TBnvbvqCPy0D79YoszcYz0KyNCFkR9MgazpM3OYDkAw=
|
||||
-----END CERTIFICATE-----
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,997 +0,0 @@
|
||||
%define _requires_exceptions devel\(linux-gate\)
|
||||
|
||||
%define lib_name_orig lib%{name}
|
||||
%define lib_major 2
|
||||
%define lib_name %mklibname kdenetwork %lib_major
|
||||
%define oname kdenetwork3
|
||||
|
||||
Name: kde3-kdenetwork
|
||||
Version: 3.5.12
|
||||
Release: %mkrel 1
|
||||
Epoch: 2
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: K Desktop Environment - Network Applications
|
||||
License: GPL
|
||||
URL: http://www.kde.org
|
||||
Source: ftp://ftp.kde.org/pub/kde/stable/%version/src/kdenetwork-%version.tar.bz2
|
||||
Source1: %{oname}-kppp.pamd
|
||||
Source2: kdenetwork-lisa
|
||||
Patch1: kdenetwork-3.5.7-add-slovenian-provider.patch
|
||||
Patch2: kdenetwork-3.5.7-fix-kdebug-120625.patch
|
||||
#Patch3: kdenetwork-3.5.8-fix-desktop-files.patch
|
||||
#Patch4: kdenetwork-3.5.9-fix-underlinking.patch
|
||||
Patch5: kdenetwork-3.5.10-wformat.patch
|
||||
#Patch6: kdenetwork-3.5.10-gcc44.patch
|
||||
#Patch7: kdenetwork-3.5.10-kopete_fix_yahoo.patch
|
||||
Patch8: kde-3.5.10-acinclude.patch
|
||||
#Patch9: fix_autotools.patch
|
||||
Patch10: kdebase-3.5.12-move-xdg-menu-dir.patch
|
||||
Patch11: kdebase-3.5.12-config.patch
|
||||
BuildRoot: %_tmppath/%name-%version-%release-root
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
%else
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
%endif
|
||||
BuildRequires: automake > 1.5
|
||||
BuildRequires: arts3-devel
|
||||
BuildRequires: freetype2-devel
|
||||
BuildRequires: kde3-macros
|
||||
BuildRequires: gettext
|
||||
BuildRequires: kdelibs-devel
|
||||
BuildRequires: kdelibs-common >= 3.1.93-5mdk
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: jpeg-devel
|
||||
BuildRequires: lcms-devel
|
||||
BuildRequires: mng-devel
|
||||
BuildRequires: png-devel
|
||||
BuildRequires: wireless-tools
|
||||
BuildRequires: avahi-compat-libdns_sd-devel
|
||||
BuildRequires: avahi-client-devel
|
||||
BuildRequires: mesaglut-devel
|
||||
BuildRequires: X11-devel
|
||||
BuildRequires: expat-devel
|
||||
BuildRequires: speex-devel
|
||||
BuildRequires: ortp-devel
|
||||
BuildRequires: meanwhile-devel
|
||||
BuildRequires: gadu-devel
|
||||
BuildRequires: libopenssl-devel
|
||||
BuildRequires: libopenslp-devel
|
||||
BuildRequires: libaudiofile-devel
|
||||
BuildRequires: libz-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: libiw-devel
|
||||
BuildRequires: qca2-devel
|
||||
BuildRequires: libidn-devel
|
||||
BuildRequires: libgsmlib-devel
|
||||
BuildRequires: libxtst-devel
|
||||
Requires: %{name}-kdict = %epoch:%version-%release
|
||||
Requires: %{name}-kget = %epoch:%version-%release
|
||||
Requires: %{name}-ksirc = %epoch:%version-%release
|
||||
Requires: %{name}-ktalk = %epoch:%version-%release
|
||||
Requires: %{name}-krfb = %epoch:%version-%release
|
||||
Requires: %{name}-kopete = %epoch:%version-%release
|
||||
Requires: %{name}-knewsticker = %epoch:%version-%release
|
||||
Obsoletes: %{name}-kxmlrpcd
|
||||
Obsoletes: %lib_name-kxmlrpcd
|
||||
Obsoletes: kdenetwork_kroupware
|
||||
Obsoletes: kdenetwork_kroupware-kppp
|
||||
Obsoletes: libkdenetwork_kroupware2
|
||||
Obsoletes: libkdenetwork_kroupware2-devel
|
||||
Obsoletes: kit
|
||||
Obsoletes: kdenetwork-kmail < 3.1.6
|
||||
Obsoletes: kdenetwork-knode < 3.1.6
|
||||
Obsoletes: kdenetwork-korn < 3.1.6
|
||||
Obsoletes: kdenetwork <= 2:3.5.10
|
||||
Obsoletes: %{oname}-kget
|
||||
Obsoletes: %{oname}-ksirc
|
||||
Obsoletes: %{oname}-ktalk
|
||||
Obsoletes: %{oname}-krfb
|
||||
Obsoletes: %{oname}-kopete
|
||||
Obsoletes: %{oname}-knewsticker
|
||||
Provides: %{oname} = %epoch:%version-%release
|
||||
|
||||
|
||||
%description
|
||||
Networking applications for the K Desktop Environment.
|
||||
|
||||
- kdict: graphical client for the DICT protocol.
|
||||
- kit: AOL instant messenger client, using the TOC protocol
|
||||
- knewsticker: RDF newsticker applet
|
||||
- kpf: public fileserver applet
|
||||
- ksirc: IRC client
|
||||
- ktalkd: talk daemon
|
||||
- lanbrowsing: lan browsing kio slave
|
||||
- krfb: Desktop Sharing server, allow others to access your desktop via VNC
|
||||
- krdc: a client for Desktop Sharing and other VNC servers
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files
|
||||
|
||||
#-----------------------------------------------------------
|
||||
|
||||
%package common
|
||||
Summary: Common files for kdenetwork
|
||||
Group: Graphical desktop/KDE3
|
||||
|
||||
Requires: kdebase3-progs >= 3.1
|
||||
Requires: kdelibs3 >= 3.1.1-15mdk
|
||||
Requires: %lib_name-common = %epoch:%version-%release
|
||||
Obsoletes: %{name} < 2:3.5.9
|
||||
Obsoletes: kdenetwork-kxmlrpcd < 2:3.5.9
|
||||
Obsoletes: %lib_name-kxmlrpcd < 2:3.5.9
|
||||
Obsoletes: kdenetwork-common
|
||||
Obsoletes: kdenetwork3-common
|
||||
Provides: kdenetwork-common = %epoch:%version-%release
|
||||
Provides: kdenetwork3-common = %epoch:%version-%release
|
||||
|
||||
%description common
|
||||
Common files for kdenetwork
|
||||
|
||||
%files common
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_libdir/kde3/kfile_torrent.*
|
||||
%_kde3_libdir/kde3/kio_zeroconf.*
|
||||
%_kde3_datadir/services/emailwindow.desktop
|
||||
%_kde3_datadir/services/kfile_torrent.desktop
|
||||
%_kde3_bindir/feedbrowser
|
||||
%_kde3_bindir/rssclient
|
||||
%_kde3_bindir/rssservice
|
||||
|
||||
%_kde3_datadir/services/kntsrcfilepropsdlg.desktop
|
||||
%_kde3_appsdir/remoteview/*
|
||||
|
||||
%dir %_kde3_appsdir/zeroconf/
|
||||
%_kde3_appsdir/zeroconf/*
|
||||
%_kde3_datadir/services/kded/dnssdwatcher.desktop
|
||||
%_kde3_libdir/kde3/kded_dnssdwatcher.*
|
||||
%_kde3_datadir/services/zeroconf.protocol
|
||||
|
||||
# KPF
|
||||
%dir %_kde3_docdir/HTML/en/kpf/
|
||||
%doc %_kde3_docdir/HTML/en/kpf/*
|
||||
%_kde3_appsdir/kicker/applets/kpfapplet.desktop
|
||||
%_kde3_datadir/icons/*/*/*/kpf.png
|
||||
%_kde3_libdir/kde3/kpf_panelapplet.*
|
||||
%_kde3_libdir/kde3/kpfpropertiesdialog.*
|
||||
%_kde3_datadir/services/kpfpropertiesdialogplugin.desktop
|
||||
|
||||
#-----------------------------------------------------------
|
||||
|
||||
%package -n %lib_name-common
|
||||
Group: System/Libraries
|
||||
Summary: Libraries for kdenetwork
|
||||
Obsoletes: %lib_name < 2:3.5.9
|
||||
Provides: %lib_name = %epoch:%version-%release
|
||||
Conflicts: kdenetwork <= 3.1-31mdk
|
||||
Conflicts: kdepim <= 3.1.92
|
||||
Obsoletes: kdenetwork-kxmlrpcd < 2:3.5.9
|
||||
Obsoletes: %lib_name-kxmlrpcd < 2:3.5.9
|
||||
|
||||
%description -n %lib_name-common
|
||||
Libraries for kdenetwork.
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n %lib_name-common -p /sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %lib_name-common -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files -n %lib_name-common
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_libdir/librss.la
|
||||
%_kde3_libdir/librss.so.*
|
||||
|
||||
#-----------------------------------------------------------
|
||||
|
||||
%package devel
|
||||
Summary: Header files for kdenetwork
|
||||
Group: Development/KDE and Qt
|
||||
Obsoletes: %lib_name-kopete-devel < 2:3.5.7-%mkrel 4
|
||||
Obsoletes: %lib_name-common-devel < 2:3.5.7-%mkrel 4
|
||||
Obsoletes: %lib_name-devel < 2:3.5.7-%mkrel 4
|
||||
Provides: %lib_name-kopete-devel = %epoch:%version
|
||||
Provides: %lib_name-common-devel = %epoch:%version
|
||||
Provides: %lib_name-devel = %epoch:%version
|
||||
Requires: %lib_name-common = %epoch:%version
|
||||
Requires: %lib_name-kopete = %epoch:%version
|
||||
Conflicts: kdenetwork <= 3.1-31mdk
|
||||
Conflicts: kdepim <= 3.1.92
|
||||
Conflicts: kdenetwork-common <= 3.1.3-37mdk
|
||||
Obsoletes: kdenetwork-devel <= 2:3.5.10
|
||||
Obsoletes: kdenetwork-devel
|
||||
Obsoletes: kdenetwork3-devel
|
||||
Provides: kdenetwork-devel = %epoch:%version-%release
|
||||
Provides: kdenetwork3-devel = %epoch:%version-%release
|
||||
|
||||
%description devel
|
||||
Header files for kdenetwork.
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_libdir/*.so
|
||||
%_kde3_includedir/*
|
||||
%exclude %_kde3_libdir/libkdeinit_*
|
||||
%exclude %_kde3_libdir/libkwireless.*
|
||||
|
||||
#-----------------------------------------------------------
|
||||
|
||||
%package kopete
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: Kopete
|
||||
Requires: %{name}-common >= %epoch:%version-%release
|
||||
Requires: %lib_name-kopete >= %epoch:%version-%release
|
||||
Provides: kopete3
|
||||
Provides: kde3-kopete
|
||||
Obsoletes: kopete <= 0.7.1-7mdk
|
||||
Obsoletes: kopete = %epoch:%version-%release
|
||||
Obsoletes: kdenetwork-kopete-nowlistening < %epoch:3.5.4
|
||||
Conflicts: kdenetwork-common <= 3.1.3-37mdk
|
||||
Obsoletes: kdenetwork-kopete
|
||||
Obsoletes: kdenetwork3-kopete
|
||||
Provides: kdenetwork-kopete = %epoch:%version-%release
|
||||
Provides: kdenetwork3-kopete = %epoch:%version-%release
|
||||
Conflicts: lisa < 1:3.4.2-11mdk
|
||||
|
||||
BuildConflicts: xmms-devel
|
||||
#Need for yahoo webcam
|
||||
Requires: jasper
|
||||
|
||||
%description kopete
|
||||
Kopete is a flexible and extendable multiple protocol instant messaging
|
||||
system designed as a plugin-based system.
|
||||
|
||||
All protocols are plugins and allow modular installment, configuration,
|
||||
and usage without the main application knowing anything about the plugin
|
||||
being loaded.
|
||||
|
||||
The goal of Kopete is to provide users with a standard and easy to use
|
||||
interface between all of their instant messaging systems, but at the same
|
||||
time also providing developers with the ease of writing plugins to support
|
||||
a new protocol.
|
||||
|
||||
The core Kopete development team provides a handful of plugins that most
|
||||
users can use, in addition to templates for new developers to base a
|
||||
plugin off of.
|
||||
|
||||
%post kopete
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%postun kopete
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files kopete
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_bindir/kopete
|
||||
%_kde3_bindir/winpopup-*
|
||||
%_kde3_libdir/kconf_update_bin/kopete-nameTracking-kconf_update
|
||||
%dir %_kde3_docdir/HTML/en/kopete
|
||||
%doc %_kde3_docdir/HTML/en/kopete/*
|
||||
%_kde3_appsdir/kopete*
|
||||
%_kde3_appsdir/kconf_update/kopete-*
|
||||
%_kde3_datadir/applications/kde/kopete.desktop
|
||||
%_kde3_libdir/kde3/kopete_*
|
||||
%_kde3_libdir/kde3/kcm_kopete_*
|
||||
%_kde3_libdir/kde3/libkrichtexteditpart.*
|
||||
%_kde3_datadir/services/kconfiguredialog/kopete_*
|
||||
%_kde3_datadir/sounds/*.ogg
|
||||
%_kde3_datadir/servicetypes/kopete*.desktop
|
||||
%_kde3_datadir/services/kopete*.desktop
|
||||
%_kde3_datadir/mimelnk/application/x-icq.desktop
|
||||
%_kde3_datadir/mimelnk/application/x-kopete-emoticons.desktop
|
||||
%dir %_kde3_datadir/config.kcfg/
|
||||
%_kde3_datadir/config.kcfg/historyconfig.kcfg
|
||||
%_kde3_datadir/services/chatwindow.desktop
|
||||
%_kde3_datadir/services/rdp.protocol
|
||||
%_kde3_datadir/services/rssservice.desktop
|
||||
%_kde3_datadir/services/aim.protocol
|
||||
%_kde3_datadir/services/irc.protocol
|
||||
%_kde3_iconsdir/*/*/*/kopete*
|
||||
%_kde3_iconsdir/*/*/*/jabber*
|
||||
%_kde3_iconsdir/*/*/*/webcam*
|
||||
%_kde3_iconsdir/*/*/*/*_user*
|
||||
%_kde3_iconsdir/*/*/*/*_offliners*
|
||||
%_kde3_iconsdir/*/*/*/voice*
|
||||
%_kde3_iconsdir/*/*/*/meta*
|
||||
%_kde3_iconsdir/*/*/*/account*
|
||||
%_kde3_iconsdir/*/*/*/emotico*
|
||||
%_kde3_iconsdir/*/*/*/new*
|
||||
%_kde3_iconsdir/*/*/*/contact*
|
||||
%_kde3_iconsdir/*/*/*/status*
|
||||
%_kde3_datadir/config.kcfg/kopete.kcfg
|
||||
%_kde3_datadir/config.kcfg/kopeteidentityconfigpreferences.kcfg
|
||||
%_kde3_datadir/services/invitation.protocol
|
||||
%_kde3_datadir/services/jabberdisco.protocol
|
||||
%exclude %_kde3_libdir/kde3/kcm_kopete_latex.*
|
||||
%exclude %_kde3_libdir/kde3/kopete_latex.*
|
||||
%exclude %_kde3_datadir/services/kopete_latex.desktop
|
||||
%exclude %_kde3_datadir/services/kconfiguredialog/kopete_latex_config.desktop
|
||||
%exclude %_kde3_appsdir/kopete/icons/crystalsvg/32x32/apps/latex.png
|
||||
%exclude %_kde3_datadir/config.kcfg/nowlisteningconfig.kcfg
|
||||
|
||||
#-----------------------------------------------------------
|
||||
|
||||
%package kopete-latex
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: Kopete latex plugin for write andd read mesages in latex
|
||||
Requires: %{name}-kopete
|
||||
Requires: ImageMagick
|
||||
Obsoletes: kdenetwork-kopete-latex
|
||||
Obsoletes: kdenetwork3-kopete-latex
|
||||
Provides: kdenetwork-kopete-latex = %epoch:%version-%release
|
||||
Provides: kdenetwork3-kopete-latex = %epoch:%version-%release
|
||||
|
||||
%description kopete-latex
|
||||
Kopete latex plugin for write andd read mesages in latexinder
|
||||
|
||||
%files kopete-latex
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_libdir/kde3/kcm_kopete_latex.*
|
||||
%_kde3_libdir/kde3/kopete_latex.*
|
||||
%_kde3_datadir/services/kopete_latex.desktop
|
||||
%_kde3_datadir/config.kcfg/latexconfig.kcfg
|
||||
%_kde3_bindir/kopete_latexconvert.sh
|
||||
%_kde3_datadir/services/kconfiguredialog/kopete_latex_config.desktop
|
||||
%_kde3_appsdir/kopete/icons/crystalsvg/32x32/apps/latex.png
|
||||
|
||||
#-----------------------------------------------------------
|
||||
|
||||
%package -n %lib_name-kopete
|
||||
Summary: Multi-protocol plugin-based instant messenger
|
||||
Group: System/Libraries
|
||||
Obsoletes: libkopete1 < 2:3.5.9
|
||||
Provides: libkopete1 = %epoch:%version-%release
|
||||
Conflicts: libkopete1 <= 0.7.1-7mdk
|
||||
Conflicts: kdepim <= 3.1.92
|
||||
Conflicts: kdenetwork-common <= 3.1.3-37mdk
|
||||
|
||||
%description -n %lib_name-kopete
|
||||
Kopete is a flexible and extendable multiple protocol instant messaging
|
||||
system designed as a plugin-based system.
|
||||
|
||||
All protocols are plugins and allow modular installment, configuration,
|
||||
and usage without the main application knowing anything about the plugin
|
||||
being loaded.
|
||||
|
||||
The goal of Kopete is to provide users with a standard and easy to use
|
||||
interface between all of their instant messaging systems, but at the same
|
||||
time also providing developers with the ease of writing plugins to support
|
||||
a new protocol.
|
||||
|
||||
The core Kopete development team provides a handful of plugins that most
|
||||
users can use, in addition to templates for new developers to base a
|
||||
plugin off of.
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n %lib_name-kopete -p /sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %lib_name-kopete -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files -n %lib_name-kopete
|
||||
%defattr(-, root, root)
|
||||
%_kde3_libdir/libkopete*.so.*
|
||||
%_kde3_libdir/libkopete*.la
|
||||
%_kde3_libdir/kconf_update_bin/kopete-account-kconf_update
|
||||
%_kde3_libdir/kconf_update_bin/kopete-pluginloader2-kconf_update
|
||||
|
||||
#-----------------------------------------------------------
|
||||
|
||||
%package -n lisa
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: Lisa server
|
||||
Requires: %{name}-common >= %{epoch}:%version-%release
|
||||
Obsoletes: ksambaplugin <= 0.5
|
||||
Obsoletes: %{name}-lisa <= 2:3.5.10
|
||||
Conflicts: kdenetwork-common < 1:3.4.2-11mdk
|
||||
Conflicts: kdenetwork-kopete < 1:3.4.2-11mdk
|
||||
|
||||
|
||||
%description -n lisa
|
||||
LISa is intended to provide a kind of "network neighbourhood" but only
|
||||
relying on the TCP/IP protocol stack, no smb or whatever.
|
||||
|
||||
%post -n lisa
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%update_menus
|
||||
%endif
|
||||
%_post_service lisa
|
||||
|
||||
%preun -n lisa
|
||||
%_preun_service lisa
|
||||
|
||||
%postun -n lisa
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files -n lisa
|
||||
%defattr(-,root,root)
|
||||
%_kde3_bindir/lisa
|
||||
%_kde3_bindir/reslisa
|
||||
%dir %_kde3_datadir/applnk/.hidden/
|
||||
%_kde3_datadir/applnk/.hidden/kcmkiolan.desktop
|
||||
%_kde3_datadir/applnk/.hidden/kcmlisa.desktop
|
||||
%_kde3_datadir/applnk/.hidden/kcmreslisa.desktop
|
||||
%dir %_kde3_docdir/HTML/en/kcontrol/lanbrowser/
|
||||
%doc %_kde3_docdir/HTML/en/kcontrol/lanbrowser/*
|
||||
%_kde3_datadir/services/fileshare_propsdlgplugin.desktop
|
||||
%_kde3_iconsdir/*/*/*/kcmsambaconf.png
|
||||
%_kde3_datadir/applications/kde/fileshare.desktop
|
||||
%_kde3_datadir/applications/kde/kcmsambaconf.desktop
|
||||
%_kde3_appsdir/konqueror/dirtree/remote/lan.desktop
|
||||
%_kde3_libdir/kde3/kio_lan.*
|
||||
%_kde3_libdir/kde3/kcm_lanbrowser.*
|
||||
%_kde3_libdir/kde3/fileshare_propsdlgplugin.*
|
||||
%_kde3_libdir/kde3/kcm_fileshare.*
|
||||
%_kde3_libdir/kde3/kcm_kcmsambaconf.*
|
||||
%_kde3_appsdir/konqsidebartng/virtual_folders/services/lisa.desktop
|
||||
%_kde3_appsdir/konqueror/servicemenus/smb2rdc.desktop
|
||||
%dir %_kde3_datadir/services/
|
||||
%_kde3_datadir/services/lan.protocol
|
||||
%_kde3_datadir/services/rlan.protocol
|
||||
%dir %_kde3_appsdir/lisa/
|
||||
%_kde3_appsdir/lisa/README
|
||||
%dir %_kde3_docdir/HTML/en/lisa
|
||||
%doc %_kde3_docdir/HTML/en/lisa/*
|
||||
%config(noreplace) /etc/rc.d/init.d/lisa
|
||||
|
||||
#-----------------------------------------------------------
|
||||
|
||||
%package ktalk
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: Ktalk program
|
||||
Provides: ktalk3
|
||||
Provides: kde3-ktalk
|
||||
Conflicts: kdenetwork <= 3.1-31mdk
|
||||
Conflicts: kdepim <= 3.1.92
|
||||
Conflicts: kdenetwork-common <= 3.1.3-37mdk
|
||||
Conflicts: kdenetwork-ktalk < 2:3.5.9-4
|
||||
Obsoletes: kdenetwork-ktalk
|
||||
Obsoletes: kdenetwork3-ktalk
|
||||
Provides: kdenetwork-ktalk = %epoch:%version-%release
|
||||
Provides: kdenetwork3-ktalk = %epoch:%version-%release
|
||||
|
||||
%description ktalk
|
||||
ktalk is a graphical talk client capable of multiple connections. It contains
|
||||
an addressbook and provides word-wrap, copy and paste, configurable fonts,
|
||||
ping, and file transfer.
|
||||
|
||||
%post ktalk
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%postun ktalk
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files ktalk
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_bindir/ktalkd
|
||||
%_kde3_bindir/ktalkdlg
|
||||
%_kde3_bindir/mail.local
|
||||
%dir %_kde3_docdir/HTML/en/ktalkd/
|
||||
%doc %_kde3_docdir/HTML/en/ktalkd/*
|
||||
%_kde3_libdir/kde3/kcm_ktalkd.*
|
||||
%dir %_kde3_datadir/sounds/
|
||||
%_kde3_datadir/sounds/ktalkd.wav
|
||||
%_kde3_datadir/applications/kde/kcmktalkd.desktop
|
||||
%_kde3_datadir/config/ktalkdrc
|
||||
%dir %_kde3_docdir/HTML/en/kcontrol/kcmtalkd/
|
||||
%doc %_kde3_docdir/HTML/en/kcontrol/kcmtalkd/*
|
||||
%_kde3_iconsdir/*/*/*/ktalkd*
|
||||
|
||||
#-----------------------------------------------------------
|
||||
|
||||
%package kppp
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: Dialer and front end for pppd
|
||||
Requires: ppp, %{name}-kppp-provider
|
||||
Provides: kppp3
|
||||
Provides: kde3-kppp
|
||||
Conflicts: kdenetwork <= 3.1-31mdk
|
||||
Conflicts: kdepim <= 3.1.92
|
||||
Conflicts: kdenetwork-common <= 3.1.3-37mdk
|
||||
Conflicts: kdenetwork-kppp < 2:3.5.9-4
|
||||
Obsoletes: kdenetwork-kppp
|
||||
Obsoletes: kdenetwork3-kppp
|
||||
Provides: kdenetwork-kppp = %epoch:%version-%release
|
||||
Provides: kdenetwork3-kppp = %epoch:%version-%release
|
||||
|
||||
%description kppp
|
||||
Kppp is a dialer and front end for pppd.
|
||||
|
||||
%post kppp
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%postun kppp
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files kppp
|
||||
%defattr(-,root,root,-)
|
||||
%dir %_sysconfdir/pam.d/
|
||||
%config(noreplace) %_sysconfdir/pam.d/kppp3
|
||||
%attr(4755,root,root) %_kde3_bindir/kppp
|
||||
%_kde3_bindir/kppplogview
|
||||
%dir %_kde3_appsdir/kppp
|
||||
%_kde3_appsdir/kppp/*
|
||||
%_kde3_datadir/applications/kde/Kppp.desktop
|
||||
%_kde3_datadir/applications/kde/kppplogview.desktop
|
||||
%_kde3_iconsdir/*/*/*/kppp.png
|
||||
%dir %_kde3_docdir/HTML/en/kppp/
|
||||
%doc %_kde3_docdir/HTML/en/kppp/*
|
||||
%exclude %_kde3_appsdir/kppp/Rules
|
||||
%exclude %_kde3_appsdir/kppp/Provider
|
||||
|
||||
#-----------------------------------------------------------
|
||||
|
||||
%package kppp-provider
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: List of providers for pppd
|
||||
Conflicts: kdepim <= 3.1.92
|
||||
Conflicts: kdenetwork-common <= 3.1.3-37mdk
|
||||
Obsoletes: kdenetwork-kppp-provider
|
||||
Obsoletes: kdenetwork3-kppp-provider
|
||||
Provides: kdenetwork-kppp-provider = %epoch:%version-%release
|
||||
Provides: kdenetwork3-kppp-provider = %epoch:%version-%release
|
||||
|
||||
%description kppp-provider
|
||||
List of providers for kppp
|
||||
|
||||
%files kppp-provider
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_appsdir/kppp/Rules
|
||||
%_kde3_appsdir/kppp/Provider
|
||||
|
||||
#-----------------------------------------------------------
|
||||
|
||||
%package ksirc
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: KDE IRC
|
||||
Provides: ksirc3
|
||||
Provides: kde3-ksirc
|
||||
Conflicts: kdenetwork <= 3.1-31mdk
|
||||
Conflicts: kdepim <= 3.1.92
|
||||
Conflicts: kdenetwork-common <= 3.1.3-37mdk
|
||||
Obsoletes: kdenetwork-kxmlrpcd < 2:3.5.9
|
||||
Obsoletes: %lib_name-ksirc < 2:3.5.9
|
||||
Obsoletes: kdenetwork-ksirc <= 2:3.5.10
|
||||
Obsoletes: kdenetwork-ksirc
|
||||
Obsoletes: kdenetwork3-ksirc
|
||||
Provides: kdenetwork-ksirc = %epoch:%version-%release
|
||||
Provides: kdenetwork3-ksirc = %epoch:%version-%release
|
||||
|
||||
%description ksirc
|
||||
KDE internet relay chat client.
|
||||
|
||||
%post ksirc
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%postun ksirc
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files ksirc
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_bindir/ksirc
|
||||
%_kde3_bindir/dsirc
|
||||
%_kde3_datadir/applications/kde/ksirc.desktop
|
||||
%dir %_kde3_docdir/HTML/en/ksirc/
|
||||
%doc %_kde3_docdir/HTML/en/ksirc/*
|
||||
%_kde3_datadir/config/ksircrc
|
||||
%_kde3_libdir/kde3/ksirc.*
|
||||
%dir %_kde3_appsdir/ksirc/
|
||||
%_kde3_appsdir/ksirc/*
|
||||
%_kde3_iconsdir/*/*/*/ksirc.png
|
||||
%_kde3_libdir/libkdeinit_ksirc.*
|
||||
|
||||
#-----------------------------------------------------------
|
||||
|
||||
%package kwifimanager
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: KWifimanager
|
||||
Provides: kwifimanager3
|
||||
Provides: kde3-kwifimanager
|
||||
Conflicts: kdenetwork <= 3.1-31mdk
|
||||
Conflicts: kdepim <= 3.1.92
|
||||
Conflicts: kdenetwork-common < 1:3.4.2-11mdk
|
||||
Requires: wireless-tools
|
||||
Obsoletes: %lib_name-kwifimanager < 2:3.5.9
|
||||
Obsoletes: kdenetwork-kwifimanager
|
||||
Obsoletes: kdenetwork3-kwifimanager
|
||||
Provides: kdenetwork-kwifimanager = %epoch:%version-%release
|
||||
Provides: kdenetwork3-kwifimanager = %epoch:%version-%release
|
||||
|
||||
%description kwifimanager
|
||||
A wireless LAN connection monitor.
|
||||
|
||||
%post kwifimanager
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%postun kwifimanager
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files kwifimanager
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_bindir/kwifimanager
|
||||
%_kde3_datadir/applications/kde/kcmwifi.desktop
|
||||
%_kde3_datadir/applications/kde/kwifimanager.desktop
|
||||
%_kde3_appsdir/kicker/applets/kwireless.desktop
|
||||
%dir %_kde3_appsdir/kwifimanager/
|
||||
%_kde3_appsdir/kwifimanager/*
|
||||
%_kde3_iconsdir/*/*/*/kwifimanager*
|
||||
%_kde3_libdir/libkwireless.*
|
||||
%_kde3_libdir/kde3/kcm_wifi.*
|
||||
%dir %_kde3_docdir/HTML/en/kwifimanager/
|
||||
%doc %_kde3_docdir/HTML/en/kwifimanager/*
|
||||
|
||||
#-----------------------------------------------------------
|
||||
|
||||
%package kdict
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: Kdict program
|
||||
Provides: kdict3
|
||||
Provides: kde3-kdict
|
||||
Conflicts: kdenetwork <= 3.1-31mdk
|
||||
Conflicts: kdepim <= 3.1.92
|
||||
Conflicts: kdenetwork-common <= 3.1.3-37mdk
|
||||
Obsoletes: kdenetwork-kxmlrpcd < 2:3.5.9
|
||||
Obsoletes: %lib_name-kdict < 2:3.5.9
|
||||
Obsoletes: kdenetwork-kdict
|
||||
Obsoletes: kdenetwork3-kdict
|
||||
Provides: kdenetwork-kdict = %epoch:%version-%release
|
||||
Provides: kdenetwork3-kdict = %epoch:%version-%release
|
||||
|
||||
%description kdict
|
||||
Kdict is a graphical client for the DICT Protocol. It enables you
|
||||
to search through dictionary-like databases for a word or phrase, then
|
||||
displays suitable definitions.
|
||||
|
||||
%post kdict
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%postun kdict
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files kdict
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_bindir/kdict
|
||||
%dir %_kde3_docdir/HTML/en/kdict/
|
||||
%doc %_kde3_docdir/HTML/en/kdict/*
|
||||
%dir %_kde3_appsdir/kdict/
|
||||
%_kde3_appsdir/kdict/*
|
||||
%_kde3_datadir/applications/kde/kdict.desktop
|
||||
%_kde3_libdir/kde3/kdict_panelapplet.*
|
||||
%_kde3_appsdir/kicker/applets/kdictapplet.desktop
|
||||
%_kde3_iconsdir/*/*/*/kdict*
|
||||
%_kde3_libdir/kde3/kdict.*
|
||||
%_kde3_libdir/kde3/kio_jabberdisco.*
|
||||
%_kde3_libdir/libkdeinit_kdict.*
|
||||
|
||||
#-----------------------------------------------------------
|
||||
|
||||
%package kget
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: Kget program
|
||||
Provides: kget3
|
||||
Provides: kde3-kget
|
||||
Conflicts: kdenetwork <= 3.1-31mdk
|
||||
Conflicts: kdepim <= 3.1.92
|
||||
Conflicts: kdenetwork-common <= 3.1.3-37mdk
|
||||
Obsoletes: kdenetwork-kget
|
||||
Obsoletes: kdenetwork3-kget
|
||||
Provides: kdenetwork-kget = %epoch:%version-%release
|
||||
Provides: kdenetwork3-kget = %epoch:%version-%release
|
||||
|
||||
%description kget
|
||||
An advanced download manager for KDE.
|
||||
|
||||
%post kget
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%postun kget
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files kget
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_bindir/kget
|
||||
%dir %_kde3_appsdir/kget/
|
||||
%_kde3_appsdir/kget/*
|
||||
%_kde3_appsdir/khtml/kpartplugins/kget_plug_in.desktop
|
||||
%_kde3_libdir/kde3/khtml_kget.*
|
||||
%_kde3_datadir/applications/kde/kget.desktop
|
||||
%_kde3_datadir/mimelnk/application/x-kgetlist.desktop
|
||||
%_kde3_appsdir/khtml/kpartplugins/kget_plug_in.rc
|
||||
%_kde3_iconsdir/*/*/*/khtml_kget*
|
||||
%_kde3_iconsdir/*/*/*/kget*
|
||||
%dir %_kde3_docdir/HTML/en/kget/
|
||||
%doc %_kde3_docdir/HTML/en/kget/*
|
||||
|
||||
%_kde3_appsdir/konqueror/servicemenus/kget_download.desktop
|
||||
|
||||
#-----------------------------------------------------------
|
||||
|
||||
%package krfb
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: Krfb, Krdc program
|
||||
Provides: krdc3
|
||||
Provides: krfb3
|
||||
Provides: kde3-krdc
|
||||
Provides: kde3-krfb
|
||||
Conflicts: kdenetwork <= 3.1-31mdk
|
||||
Conflicts: kdepim <= 3.1.92
|
||||
Conflicts: kdenetwork-common <= 3.1.3-37mdk
|
||||
Obsoletes: kdenetwork-krfb
|
||||
Obsoletes: kdenetwork3-krfb
|
||||
Provides: kdenetwork-krfb = %epoch:%version-%release
|
||||
Provides: kdenetwork3-krfb = %epoch:%version-%release
|
||||
|
||||
%description krfb
|
||||
KDE Desktop Sharing allows you to invite somebody at a remote
|
||||
location to watch and possibly control your desktop.
|
||||
|
||||
%post krfb
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%postun krfb
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files krfb
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_bindir/krdc
|
||||
%_kde3_bindir/krfb
|
||||
%_kde3_bindir/krfb_httpd
|
||||
%_kde3_datadir/services/vnc.protocol
|
||||
%_kde3_datadir/services/kinetd_krfb.desktop
|
||||
%dir %_kde3_appsdir/kinetd/
|
||||
%_kde3_appsdir/kinetd/*
|
||||
%dir %_kde3_docdir/HTML/en/krfb/
|
||||
%doc %_kde3_docdir/HTML/en/krfb/*
|
||||
%doc %_kde3_docdir/HTML/en/krdc/*
|
||||
%_kde3_datadir/applications/kde/kcmkrfb.desktop
|
||||
%_kde3_datadir/applications/kde/krdc.desktop
|
||||
%_kde3_datadir/applications/kde/krfb.desktop
|
||||
%dir %_kde3_appsdir/krfb/
|
||||
%_kde3_appsdir/krfb/*
|
||||
%dir %_kde3_appsdir/krdc/
|
||||
%_kde3_appsdir/krdc/*
|
||||
%_kde3_libdir/kde3/kcm_krfb.*
|
||||
%_kde3_libdir/kde3/kded_kinetd.*
|
||||
%_kde3_iconsdir/*/*/*/krfb*
|
||||
%_kde3_iconsdir/*/*/*/krdc*
|
||||
%_kde3_datadir/servicetypes/kinetdmodule.desktop
|
||||
%_kde3_datadir/services/kded/kinetd.desktop
|
||||
%_kde3_datadir/services/kinetd_krfb_httpd.desktop
|
||||
|
||||
#-----------------------------------------------------------
|
||||
|
||||
%package knewsticker
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: RDF newsticker applet
|
||||
Provides: knewsticker3
|
||||
Provides: kde3-knewsticker
|
||||
Obsoletes: %lib_name-knewsticker < 2:3.5.9
|
||||
Conflicts: kdenetwork <= 3.1-31mdk
|
||||
Conflicts: kdepim <= 3.1.92
|
||||
Conflicts: kdenetwork-common < 1:3.4.2-11mdk
|
||||
Obsoletes: kdenetwork-knewsticker
|
||||
Obsoletes: kdenetwork3-knewsticker
|
||||
Provides: kdenetwork-knewsticker = %epoch:%version-%release
|
||||
Provides: kdenetwork3-knewsticker = %epoch:%version-%release
|
||||
|
||||
%description knewsticker
|
||||
Knewsticker: RDF newsticker applet
|
||||
|
||||
%post knewsticker
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%postun knewsticker
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files knewsticker
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_bindir/knewstickerstub
|
||||
%dir %_kde3_docdir/HTML/en/knewsticker/
|
||||
%doc %_kde3_docdir/HTML/en/knewsticker/*
|
||||
%_kde3_datadir/applications/kde/knewsticker-standalone.desktop
|
||||
%dir %_kde3_appsdir/knewsticker/
|
||||
%_kde3_appsdir/knewsticker/*
|
||||
%_kde3_appsdir/kicker/applets/knewsticker.desktop
|
||||
%dir %_kde3_appsdir/kconf_update/
|
||||
%_kde3_appsdir/kconf_update/knewsticker.upd
|
||||
%_kde3_appsdir/kconf_update/knt-0.1-0.2.pl
|
||||
%_kde3_iconsdir/*/*/*/knewsticker.png
|
||||
%_kde3_datadir/applnk/.hidden/knewstickerstub.desktop
|
||||
%_kde3_libdir/kde3/knewsticker_panelapplet.*
|
||||
%_kde3_libdir/kde3/libkntsrcfilepropsdlg.*
|
||||
|
||||
#-----------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q -n kdenetwork-%version
|
||||
%patch1 -p0
|
||||
%patch2 -p1
|
||||
#%patch3 -p0
|
||||
#%patch4 -p0
|
||||
%patch5 -p0
|
||||
#%patch6 -p1
|
||||
#%patch7 -p0
|
||||
%patch8 -p1
|
||||
#%patch9 -p1
|
||||
%patch10 -p0
|
||||
%patch11 -p0
|
||||
|
||||
%build
|
||||
|
||||
PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
|
||||
export xdg_menudir=%_sysconfdir/xdg/kde/menus
|
||||
|
||||
make -f admin/Makefile.common cvs
|
||||
|
||||
%configure_kde3 \
|
||||
--with-extra-includes=/usr/include/avahi-compat-libdns_sd/:/opt/kde3/include/tqt \
|
||||
--with-extra-libs=/opt/kde3/lib \
|
||||
--without-xmms
|
||||
|
||||
%make
|
||||
|
||||
%install
|
||||
rm -fr %buildroot
|
||||
%makeinstall_std
|
||||
|
||||
install -d -m 0755 %buildroot/etc/rc.d/init.d
|
||||
install -m 0755 %SOURCE2 %buildroot/etc/rc.d/init.d/lisa
|
||||
|
||||
install -d -m 0755 %buildroot/%_sysconfdir/pam.d/
|
||||
install -m 0644 %SOURCE1 %buildroot/%_sysconfdir/pam.d/kppp3
|
||||
|
||||
%clean
|
||||
rm -fr %buildroot
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 22 2010 Tim Williams <tim@my-place.org.uk> 2:3.5.12-1mvt2010.2
|
||||
+ Update to Trinity 3.5.12 sources
|
||||
+ Add xdg and build process patches
|
||||
+ Fix kdenetwork-3.5.7-fix-kdebug-120625.patch
|
||||
- Remove kdenetwork-3.5.8-fix-desktop-files.patch
|
||||
- Remove kdenetwork-3.5.9-fix-underlinking.patch
|
||||
- Remove kdenetwork-3.5.10-gcc44.patch
|
||||
- Remove kdenetwork-3.5.10-kopete_fix_yahoo.patch
|
||||
|
||||
* Mon Jul 19 2010 Tim Williams <tim@my-place.org.uk> 2:3.5.10-8mvt2010.0
|
||||
+ Rebuild for MDV 2010.1
|
||||
|
||||
* Tue Jan 12 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2:3.5.10-7mvt2010.0
|
||||
+ Rebuilt for 2010.0
|
||||
+ Fix automake 1.11 and autoconf 2.64 incompability
|
||||
+ Fix kopete yahoo protocol
|
||||
|
||||
* Thu Apr 23 2009 Frederic Crozat <fcrozat@mandriva.com> 2:3.5.10-5mdv2009.1
|
||||
+ Revision: 368894
|
||||
- Fix uninstallable package
|
||||
|
||||
* Wed Apr 22 2009 Frederic Crozat <fcrozat@mandriva.com> 2:3.5.10-4mdv2009.1
|
||||
+ Revision: 368670
|
||||
- Fix incorrect dependency on kdenetwork-common (Mdv bug #50180)
|
||||
|
||||
* Wed Apr 22 2009 Nicolas Lécureuil <neoclust@mandriva.org> 2:3.5.10-3mdv2009.1
|
||||
+ Revision: 368612
|
||||
- Fix conflicts
|
||||
|
||||
* Fri Apr 03 2009 Nicolas Lécureuil <neoclust@mandriva.org> 2:3.5.10-2mdv2009.1
|
||||
+ Revision: 363689
|
||||
- Fix Requires for lisa
|
||||
|
||||
* Thu Apr 02 2009 Helio Chissini de Castro <helio@mandriva.com> 2:3.5.10-1mdv2009.1
|
||||
+ Revision: 363587
|
||||
- Pushing back kde3 kdenetwork :-/
|
||||
- Another headache generated for the bring kde3 back to live
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- import kdenetwork
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
--- kopete/plugins/statistics/sqlite/shell.c.orig 2009-04-02 20:04:41.000000000 +0200
|
||||
+++ kopete/plugins/statistics/sqlite/shell.c 2009-04-02 20:29:12.000000000 +0200
|
||||
@@ -356,7 +356,7 @@
|
||||
output_c_string(p->out, z);
|
||||
}
|
||||
if( bSep ){
|
||||
- fprintf(p->out, p->separator);
|
||||
+ fprintf(p->out, "%s", p->separator);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1005,7 +1005,7 @@
|
||||
}else
|
||||
|
||||
if( c=='h' && strncmp(azArg[0], "help", n)==0 ){
|
||||
- fprintf(stderr,zHelp);
|
||||
+ fprintf(stderr, "%s", zHelp);
|
||||
}else
|
||||
|
||||
if( c=='i' && strncmp(azArg[0], "import", n)==0 && nArg>=3 ){
|
||||
--- kopete/plugins/statistics/sqlite/vdbe.c.orig 2009-04-02 20:30:39.000000000 +0200
|
||||
+++ kopete/plugins/statistics/sqlite/vdbe.c 2009-04-02 20:31:02.000000000 +0200
|
||||
@@ -361,7 +361,7 @@
|
||||
}
|
||||
}
|
||||
zBuf[k++] = ']';
|
||||
- k += sprintf(&zBuf[k], encnames[pMem->enc]);
|
||||
+ k += sprintf(&zBuf[k], "%s", encnames[pMem->enc]);
|
||||
zBuf[k++] = 0;
|
||||
}
|
||||
}
|
||||
@ -1,449 +0,0 @@
|
||||
--- kppp/DB/Provider/Slovenia/AmisNet.old 2005-09-10 10:20:35.000000000 +0200
|
||||
+++ kppp/DB/Provider/Slovenia/AmisNet 2007-05-29 17:15:17.000000000 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
# KDE Config File
|
||||
-# $Id: AmisNet 129308 2001-12-31 13:24:17Z romanm $
|
||||
-# $Source$
|
||||
+# $Id: AmisNet,v 1.2 2001/12/31 13:24:17 romanm Exp $
|
||||
+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/AmisNet,v $
|
||||
#
|
||||
Name=AmisNet
|
||||
AccountingEnabled=1
|
||||
--- /dev/null 2006-08-21 11:51:14.000000000 +0200
|
||||
+++ kppp/DB/Provider/Slovenia/AgendaSloN 2007-05-29 17:16:29.000000000 +0200
|
||||
@@ -0,0 +1,27 @@
|
||||
+# KDE Config File
|
||||
+# $Id: MojNet,v 1.2 2001/12/31 13:24:17 romanm Exp $
|
||||
+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/MojNet,v $
|
||||
+#
|
||||
+Name=AgendaSloN
|
||||
+AccountingEnabled=1
|
||||
+AccountingFile=/Slovenia/omrezje_0889.rst
|
||||
+Authentication=1
|
||||
+AutoName=0
|
||||
+Command=
|
||||
+DNS=
|
||||
+AutoDNS=1
|
||||
+DefaultRoute=1
|
||||
+DisconnectCommand=
|
||||
+Domain=moj.net
|
||||
+ExDNSDisabled=0
|
||||
+Gateway=0.0.0.0
|
||||
+IPAddr=0.0.0.0
|
||||
+Password=%PASSWORD%
|
||||
+ScriptArguments=
|
||||
+ScriptCommands=
|
||||
+StorePassword=1
|
||||
+SubnetMask=0.0.0.0
|
||||
+Username=%USERNAME%
|
||||
+VolumeAccountingEnabled=0
|
||||
+pppdArguments=
|
||||
+Phonenumber=088932380
|
||||
--- kppp/DB/Provider/Slovenia/Arnes.old 2007-05-29 17:18:20.000000000 +0200
|
||||
+++ kppp/DB/Provider/Slovenia/Arnes 2005-03-10 10:12:11.000000000 +0100
|
||||
@@ -1,6 +1,6 @@
|
||||
# KDE Config File
|
||||
-# $Id: Arnes 129303 2001-12-31 12:48:40Z romanm $
|
||||
-# $Source$
|
||||
+# $Id: Arnes,v 1.1 2001/12/31 12:48:40 romanm Exp $
|
||||
+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/Arnes,v $
|
||||
#
|
||||
Name=Arnes
|
||||
AccountingEnabled=1
|
||||
--- /dev/null 2006-08-21 11:51:14.000000000 +0200
|
||||
+++ kppp/DB/Provider/Slovenia/K2Net 2005-03-10 11:27:25.000000000 +0100
|
||||
@@ -0,0 +1,27 @@
|
||||
+# KDE Config File
|
||||
+# $Id: MojNet,v 1.2 2001/12/31 13:24:17 romanm Exp $
|
||||
+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/MojNet,v $
|
||||
+#
|
||||
+Name=K2Net
|
||||
+AccountingEnabled=1
|
||||
+AccountingFile=/Slovenia/omrezje_0889.rst
|
||||
+Authentication=1
|
||||
+AutoName=0
|
||||
+Command=
|
||||
+DNS=
|
||||
+AutoDNS=1
|
||||
+DefaultRoute=1
|
||||
+DisconnectCommand=
|
||||
+Domain=moj.net
|
||||
+ExDNSDisabled=0
|
||||
+Gateway=0.0.0.0
|
||||
+IPAddr=0.0.0.0
|
||||
+Password=%PASSWORD%
|
||||
+ScriptArguments=
|
||||
+ScriptCommands=
|
||||
+StorePassword=1
|
||||
+SubnetMask=0.0.0.0
|
||||
+Username=%USERNAME%
|
||||
+VolumeAccountingEnabled=0
|
||||
+pppdArguments=
|
||||
+Phonenumber=088932340
|
||||
--- kppp/DB/Provider/Slovenia/Kiss.old 2005-09-10 10:20:35.000000000 +0200
|
||||
+++ kppp/DB/Provider/Slovenia/Kiss 2005-03-10 10:12:11.000000000 +0100
|
||||
@@ -1,6 +1,6 @@
|
||||
# KDE Config File
|
||||
-# $Id: Kiss 129303 2001-12-31 12:48:40Z romanm $
|
||||
-# $Source$
|
||||
+# $Id: Kiss,v 1.1 2001/12/31 12:48:40 romanm Exp $
|
||||
+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/Kiss,v $
|
||||
#
|
||||
Name=Kiss
|
||||
AccountingEnabled=1
|
||||
--- /dev/null 2006-08-21 11:51:14.000000000 +0200
|
||||
+++ kppp/DB/Provider/Slovenia/MWdialup386 2005-03-10 11:39:56.000000000 +0100
|
||||
@@ -0,0 +1,27 @@
|
||||
+# KDE Config File
|
||||
+# $Id: MojNet,v 1.2 2001/12/31 13:24:17 romanm Exp $
|
||||
+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/MojNet,v $
|
||||
+#
|
||||
+Name=MWdialup386
|
||||
+AccountingEnabled=1
|
||||
+AccountingFile=/Slovenia/omrezje_0888.rst
|
||||
+Authentication=1
|
||||
+AutoName=0
|
||||
+Command=
|
||||
+DNS=
|
||||
+AutoDNS=1
|
||||
+DefaultRoute=1
|
||||
+DisconnectCommand=
|
||||
+Domain=moj.net
|
||||
+ExDNSDisabled=0
|
||||
+Gateway=0.0.0.0
|
||||
+IPAddr=0.0.0.0
|
||||
+Password=%PASSWORD%
|
||||
+ScriptArguments=
|
||||
+ScriptCommands=
|
||||
+StorePassword=1
|
||||
+SubnetMask=0.0.0.0
|
||||
+Username=%USERNAME%
|
||||
+VolumeAccountingEnabled=0
|
||||
+pppdArguments=
|
||||
+Phonenumber=088832666
|
||||
--- /dev/null 2006-08-21 11:51:14.000000000 +0200
|
||||
+++ kppp/DB/Provider/Slovenia/MaSiCoM 2005-03-10 11:32:34.000000000 +0100
|
||||
@@ -0,0 +1,27 @@
|
||||
+# KDE Config File
|
||||
+# $Id: MojNet,v 1.2 2001/12/31 13:24:17 romanm Exp $
|
||||
+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/MojNet,v $
|
||||
+#
|
||||
+Name=MaSiCoM
|
||||
+AccountingEnabled=1
|
||||
+AccountingFile=/Slovenia/omrezje_0888.rst
|
||||
+Authentication=1
|
||||
+AutoName=0
|
||||
+Command=
|
||||
+DNS=
|
||||
+AutoDNS=1
|
||||
+DefaultRoute=1
|
||||
+DisconnectCommand=
|
||||
+Domain=moj.net
|
||||
+ExDNSDisabled=0
|
||||
+Gateway=0.0.0.0
|
||||
+IPAddr=0.0.0.0
|
||||
+Password=%PASSWORD%
|
||||
+ScriptArguments=
|
||||
+ScriptCommands=
|
||||
+StorePassword=1
|
||||
+SubnetMask=0.0.0.0
|
||||
+Username=%USERNAME%
|
||||
+VolumeAccountingEnabled=0
|
||||
+pppdArguments=
|
||||
+Phonenumber=088832999
|
||||
--- kppp/DB/Provider/Slovenia/MojNet.old 2005-09-10 10:20:35.000000000 +0200
|
||||
+++ kppp/DB/Provider/Slovenia/MojNet 2005-03-10 10:12:11.000000000 +0100
|
||||
@@ -1,6 +1,6 @@
|
||||
# KDE Config File
|
||||
-# $Id: MojNet 129308 2001-12-31 13:24:17Z romanm $
|
||||
-# $Source$
|
||||
+# $Id: MojNet,v 1.2 2001/12/31 13:24:17 romanm Exp $
|
||||
+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/MojNet,v $
|
||||
#
|
||||
Name=MojNet
|
||||
AccountingEnabled=1
|
||||
--- /dev/null 2006-08-21 11:51:14.000000000 +0200
|
||||
+++ kppp/DB/Provider/Slovenia/Netsi 2005-03-10 11:44:18.000000000 +0100
|
||||
@@ -0,0 +1,27 @@
|
||||
+# KDE Config File
|
||||
+# $Id: MojNet,v 1.2 2001/12/31 13:24:17 romanm Exp $
|
||||
+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/MojNet,v $
|
||||
+#
|
||||
+Name=Netsi
|
||||
+AccountingEnabled=1
|
||||
+AccountingFile=/Slovenia/omrezje_0889.rst
|
||||
+Authentication=1
|
||||
+AutoName=0
|
||||
+Command=
|
||||
+DNS=
|
||||
+AutoDNS=1
|
||||
+DefaultRoute=1
|
||||
+DisconnectCommand=
|
||||
+Domain=moj.net
|
||||
+ExDNSDisabled=0
|
||||
+Gateway=0.0.0.0
|
||||
+IPAddr=0.0.0.0
|
||||
+Password=%PASSWORD%
|
||||
+ScriptArguments=
|
||||
+ScriptCommands=
|
||||
+StorePassword=1
|
||||
+SubnetMask=0.0.0.0
|
||||
+Username=%USERNAME%
|
||||
+VolumeAccountingEnabled=0
|
||||
+pppdArguments=
|
||||
+Phonenumber=088932430
|
||||
--- /dev/null 2006-08-21 11:51:14.000000000 +0200
|
||||
+++ kppp/DB/Provider/Slovenia/Perftech 2005-03-10 11:30:46.000000000 +0100
|
||||
@@ -0,0 +1,27 @@
|
||||
+# KDE Config File
|
||||
+# $Id: MojNet,v 1.2 2001/12/31 13:24:17 romanm Exp $
|
||||
+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/MojNet,v $
|
||||
+#
|
||||
+Name=Perftech
|
||||
+AccountingEnabled=1
|
||||
+AccountingFile=/Slovenia/omrezje_0888.rst
|
||||
+Authentication=1
|
||||
+AutoName=0
|
||||
+Command=
|
||||
+DNS=
|
||||
+AutoDNS=1
|
||||
+DefaultRoute=1
|
||||
+DisconnectCommand=
|
||||
+Domain=moj.net
|
||||
+ExDNSDisabled=0
|
||||
+Gateway=0.0.0.0
|
||||
+IPAddr=0.0.0.0
|
||||
+Password=%PASSWORD%
|
||||
+ScriptArguments=
|
||||
+ScriptCommands=
|
||||
+StorePassword=1
|
||||
+SubnetMask=0.0.0.0
|
||||
+Username=%USERNAME%
|
||||
+VolumeAccountingEnabled=0
|
||||
+pppdArguments=
|
||||
+Phonenumber=088832360
|
||||
|
||||
--- kppp/DB/Provider/Slovenia/SiOL.old 2005-09-10 10:20:35.000000000 +0200
|
||||
+++ kppp/DB/Provider/Slovenia/SiOL 2005-03-10 10:12:11.000000000 +0100
|
||||
@@ -1,6 +1,6 @@
|
||||
# KDE Config File
|
||||
-# $Id: SiOL 129600 2002-01-02 21:25:21Z romanm $
|
||||
-# $Source$
|
||||
+# $Id: SiOL,v 1.2 2002/01/02 21:25:21 romanm Exp $
|
||||
+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/SiOL,v $
|
||||
#
|
||||
Name=SiOL
|
||||
AccountingEnabled=1
|
||||
--- kppp/DB/Provider/Slovenia/Volja.old 2005-09-10 10:20:35.000000000 +0200
|
||||
+++ kppp/DB/Provider/Slovenia/Volja 2005-03-10 11:53:30.000000000 +0100
|
||||
@@ -1,10 +1,10 @@
|
||||
# KDE Config File
|
||||
-# $Id: Volja 129308 2001-12-31 13:24:17Z romanm $
|
||||
-# $Source$
|
||||
+# $Id: Volja,v 1.2 2001/12/31 13:24:17 romanm Exp $
|
||||
+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/Volja,v $
|
||||
#
|
||||
Name=Volja
|
||||
AccountingEnabled=1
|
||||
-AccountingFile=/Slovenia/omrezje_0889.rst
|
||||
+AccountingFile=/Slovenia/omrezje_0888.rst
|
||||
Authentication=1
|
||||
AutoName=0
|
||||
Command=
|
||||
@@ -24,4 +24,4 @@
|
||||
Username=%USERNAME%
|
||||
VolumeAccountingEnabled=0
|
||||
pppdArguments=
|
||||
-Phonenumber=088932480
|
||||
+Phonenumber=088832480
|
||||
--- kppp/DB/Provider/Slovenia/Makefile.am.old 2005-09-10 10:20:35.000000000 +0200
|
||||
+++ kppp/DB/Provider/Slovenia/Makefile.am 2007-05-29 17:45:49.000000000 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-pkg_DATA = AmisNet Arnes Kiss MojNet SiOL Volja
|
||||
+pkg_DATA = AgendaSloN AmisNet Arnes K2Net Kiss MWdialup386 MaSiCoM MojNet Netsi Perftech SiOL Volja
|
||||
|
||||
pkgdir = $(kde_datadir)/kppp/Provider/Slovenia
|
||||
|
||||
--- kppp/Rules/Slovenia/omrezje_0880.rst.orig 2005-09-10 10:20:36.000000000 +0200
|
||||
+++ kppp/Rules/Slovenia/omrezje_0880.rst 2005-03-10 11:12:49.000000000 +0100
|
||||
@@ -1,9 +1,12 @@
|
||||
################################################################
|
||||
-# $Id: omrezje_0880.rst 135052 2002-02-02 20:19:29Z romanm $
|
||||
-# $Source$
|
||||
+# $Id: omrezje_0880.rst,v 1.2 2002/02/02 20:19:29 romanm Exp $
|
||||
+# $Source: /home/kde/kdenetwork/kppp/Rules/Slovenia/omrezje_0880.rst,v $
|
||||
#
|
||||
# RULES FOR KPPP WITH SLOVENIAN PHONE NETWORK 0880 (ISP PROVIDER).
|
||||
#
|
||||
+# 2005-03-19
|
||||
+# Updated by gregor.pirnaver@email.si.
|
||||
+#
|
||||
# 2002-02-02:
|
||||
# Updated by roman.maurer@amis.net,
|
||||
# based on data provided by Primoz Hrvatin.
|
||||
@@ -40,13 +43,16 @@
|
||||
# This is charged whenever you connect. The amount is payed to the
|
||||
# phone company.
|
||||
|
||||
-per_connection=6.30
|
||||
+# per_connection=6.30
|
||||
+per_connection=0.0
|
||||
+minimum_costs=1.02
|
||||
+
|
||||
|
||||
# "on monday until sunday the costs
|
||||
# are 2.04 on normal and 1.02 on discounted per each 60 seconds"
|
||||
|
||||
on (monday..saturday) between (0:00..6:59) use (1.02, 60)
|
||||
-on (monday..saturday) between (7:00..18:59) use (2.04, 60)
|
||||
+on (monday..saturday) between (7:00..18:59) use (1.84, 60)
|
||||
on (monday..saturday) between (19:00..23:59) use (1.02, 60)
|
||||
on (sunday) between () use (1.02, 60)
|
||||
|
||||
--- kppp/Rules/Slovenia/omrezje_0889.rst.orig 2005-09-10 10:20:36.000000000 +0200
|
||||
+++ kppp/Rules/Slovenia/omrezje_0889.rst 2005-03-10 11:13:40.000000000 +0100
|
||||
@@ -1,9 +1,12 @@
|
||||
################################################################
|
||||
-# $Id: omrezje_0889.rst 135052 2002-02-02 20:19:29Z romanm $
|
||||
-# $Source$
|
||||
+# $Id: omrezje_0889.rst,v 1.2 2002/02/02 20:19:29 romanm Exp $
|
||||
+# $Source: /home/kde/kdenetwork/kppp/Rules/Slovenia/omrezje_0889.rst,v $
|
||||
#
|
||||
# RULES FOR KPPP WITH SLOVENIAN PHONE NETWORK 0889 (ISP PROVIDERS).
|
||||
#
|
||||
+# 2005-03-19
|
||||
+# Updated by gregor.pirnaver@email.si.
|
||||
+#
|
||||
# 2002-02-02:
|
||||
# Updated by roman.maurer@amis.net,
|
||||
# based on data provided by Primoz Hrvatin.
|
||||
@@ -30,14 +33,14 @@
|
||||
################################################################
|
||||
|
||||
per_connection=0.0
|
||||
-minimum_costs=2.52
|
||||
+minimum_costs=1.26
|
||||
|
||||
|
||||
# same as above. You must use 24 hour notation, or the accounting
|
||||
# will not work correctly. (Example: write 15:00 for 3 pm)
|
||||
|
||||
on (monday..saturday) between (0:00..6:59) use (1.26, 60)
|
||||
-on (monday..saturday) between (7:00..18:59) use (2.52, 60)
|
||||
+on (monday..saturday) between (7:00..18:59) use (2.27, 60)
|
||||
on (monday..saturday) between (19:00..23:59) use (1.26, 60)
|
||||
on (sunday) between () use (1.26, 60)
|
||||
|
||||
--- /dev/null 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ kppp/Rules/Slovenia/omrezje_0888.rst 2007-05-29 19:56:14.000000000 +0200
|
||||
@@ -0,0 +1,62 @@
|
||||
+################################################################
|
||||
+# $Id: omrezje_0889.rst,v 1.2 2002/02/02 20:19:29 romanm Exp $
|
||||
+# $Source: /home/kde/kdenetwork/kppp/Rules/Slovenia/omrezje_0889.rst,v $
|
||||
+#
|
||||
+# RULES FOR KPPP WITH SLOVENIAN PHONE NETWORK 0889 (ISP PROVIDERS).
|
||||
+#
|
||||
+#
|
||||
+# 2005-03-19
|
||||
+# Updated by gregor.pirnaver@email.si.
|
||||
+#
|
||||
+# 2002-02-02:
|
||||
+# Updated by roman.maurer@amis.net,
|
||||
+# based on data provided by Primoz Hrvatin.
|
||||
+#
|
||||
+# 2000-09-25:
|
||||
+# Prepared by Ales.Kosir@hermes.si,
|
||||
+# based on data, provided by Srdjan Cvjetovic.
|
||||
+#
|
||||
+# Calls from stationary phone network to the ISP numbers 0889:
|
||||
+#
|
||||
+################################################################
|
||||
+name=omrezje-0888.rst
|
||||
+
|
||||
+################################################################
|
||||
+# currency settings
|
||||
+################################################################
|
||||
+
|
||||
+currency_symbol=SIT
|
||||
+currency_position=right
|
||||
+currency_digits=2
|
||||
+
|
||||
+################################################################
|
||||
+# connection settings
|
||||
+################################################################
|
||||
+
|
||||
+per_connection=0.0
|
||||
+minimum_costs=3.36
|
||||
+
|
||||
+
|
||||
+# same as above. You must use 24 hour notation, or the accounting
|
||||
+# will not work correctly. (Example: write 15:00 for 3 pm)
|
||||
+
|
||||
+on (monday..saturday) between (0:00..6:59) use (3.36, 60)
|
||||
+on (monday..saturday) between (7:00..18:59) use (4.20, 60)
|
||||
+on (monday..saturday) between (19:00..23:59) use (3.36, 60)
|
||||
+on (sunday) between () use (3.36, 60)
|
||||
+
|
||||
+# Drzavni prazniki:
|
||||
+# 1.1., 2.1 - Novo leto
|
||||
+# 8.2. - Slovenski kulturni praznik
|
||||
+# Easter - Velika noc
|
||||
+# Easter Monday - Velikonocni ponedeljek
|
||||
+# 27.4. - Dan upora proti okupatorju
|
||||
+# 1.5.,2.5. - Praznik dela
|
||||
+# - Binkosti
|
||||
+# 25.6. - Dan drzavnosti
|
||||
+# 15.8. - Marijino vnebovzetje
|
||||
+# 31.10. - Dan reformacije
|
||||
+# 1.11. - Dan spomina na mrtve
|
||||
+# 25.12. - Bozic
|
||||
+# 26.12. - Dan samostojnosti
|
||||
+on (01/01, 01/02, 02/08, easter, easter+1, 04/26, 05/01, 05/02, easter+50, 06/25, 08/15, 10/31, 11/01, 12/25, 12/26) between () use (3.36, 60)
|
||||
--- kppp/Rules/Slovenia/stacionarno_omrezje.rst.orig 2005-09-10 10:20:36.000000000 +0200
|
||||
+++ kppp/Rules/Slovenia/stacionarno_omrezje.rst 2005-03-10 11:12:01.000000000 +0100
|
||||
@@ -2,6 +2,10 @@
|
||||
#
|
||||
# NAME OF THE RULESET. This is NEEDED for accounting purposes.
|
||||
#
|
||||
+#
|
||||
+# 2005-03-19
|
||||
+# Updated by gregor.pirnaver@email.si.
|
||||
+#
|
||||
# Prepared by Ales.Kosir@hermes.si,
|
||||
# based on data, provided by Srdjan Cvjetovic
|
||||
#
|
||||
@@ -25,12 +29,12 @@
|
||||
################################################################
|
||||
|
||||
per_connection=0.0
|
||||
-minimum_costs=4.11
|
||||
+minimum_costs=5.04
|
||||
|
||||
-on (monday..saturday) between (0:00..6:59) use (4.11, 120)
|
||||
-on (monday..saturday) between (7:00..18:59) use (4.11, 60)
|
||||
-on (monday..saturday) between (19:00..23:59) use (4.11, 120)
|
||||
-on (sunday) between () use (4.11, 120)
|
||||
+on (monday..saturday) between (0:00..6:59) use (5.04, 120)
|
||||
+on (monday..saturday) between (7:00..18:59) use (6.30, 60)
|
||||
+on (monday..saturday) between (19:00..23:59) use (5.04, 120)
|
||||
+on (sunday) between () use (5.04, 120)
|
||||
|
||||
# Drzavni prazniki:
|
||||
# 1.1., 2.1 - Novo leto
|
||||
@@ -46,7 +50,7 @@
|
||||
# 1.11. - Dan spomina na mrtve
|
||||
# 25.12. - Bozic
|
||||
# 26.12. - Dan samostojnosti
|
||||
-on (01/01, 01/02, 02/08, easter, easter+1, 04/26, 05/01, 05/02, easter+50, 06/25, 08/15, 10/31, 11/01, 12/25, 12/26) between () use (4.11, 120)
|
||||
+on (01/01, 01/02, 02/08, easter, easter+1, 04/26, 05/01, 05/02, easter+50, 06/25, 08/15, 10/31, 11/01, 12/25, 12/26) between () use (5.04, 120)
|
||||
|
||||
|
||||
|
||||
--- kppp/Rules/Slovenia/Makefile.am~ 2005-09-10 10:20:36.000000000 +0200
|
||||
+++ kppp/Rules/Slovenia/Makefile.am 2007-05-29 21:56:32.000000000 +0200
|
||||
@@ -1,4 +1,5 @@
|
||||
pkg_DATA = omrezje_0880.rst \
|
||||
+ omrezje_0888.rst \
|
||||
omrezje_0889.rst \
|
||||
stacionarno_omrezje.rst
|
||||
|
||||
@ -1,167 +0,0 @@
|
||||
diff -Nur kopete-0.12b1/kopete/protocols/irc/ircprotocol.cpp kopete-0.12b1f/kopete/protocols/irc/ircprotocol.cpp
|
||||
--- kopete-0.12b1/kopete/protocols/irc/ircprotocol.cpp 2006-03-08 09:25:24.000000000 +0800
|
||||
+++ kopete-0.12b1f/kopete/protocols/irc/ircprotocol.cpp 2006-03-14 20:03:46.000000000 +0800
|
||||
@@ -136,15 +136,15 @@
|
||||
TQStringList::split(' ',"irc_voice contact_away_overlay"), i18n("Away")),
|
||||
|
||||
m_UserStatusOnline(Kopete::OnlineStatus::Online,
|
||||
- 25, this, Online, TQString::null, i18n("Online"), i18n("Online"), Kopete::OnlineStatusManager::Online),
|
||||
+ 25, this, Online, TQString::null, ("Online"), i18n("Online"), Kopete::OnlineStatusManager::Online),
|
||||
|
||||
m_UserStatusAway(Kopete::OnlineStatus::Away,
|
||||
2, this, Online | Away, "contact_away_overlay",
|
||||
- i18n("Away"), i18n("Away"), Kopete::OnlineStatusManager::Away),
|
||||
+ ("Away"), i18n("Away"), Kopete::OnlineStatusManager::Away),
|
||||
m_UserStatusConnecting(Kopete::OnlineStatus::Connecting,
|
||||
1, this, Connecting, "irc_connecting", i18n("Connecting")),
|
||||
m_UserStatusOffline(Kopete::OnlineStatus::Offline,
|
||||
- 0, this, Offline, TQString::null, i18n("Offline"), i18n("Offline"), Kopete::OnlineStatusManager::Offline),
|
||||
+ 0, this, Offline, TQString::null, ("Offline"), i18n("Offline"), Kopete::OnlineStatusManager::Offline),
|
||||
|
||||
m_StatusUnknown(Kopete::OnlineStatus::Unknown,
|
||||
999, this, 999, "status_unknown", i18n("Status not available")),
|
||||
diff -Nur kopete-0.12b1/kopete/protocols/jabber/jabberprotocol.cpp kopete-0.12b1f/kopete/protocols/jabber/jabberprotocol.cpp
|
||||
--- kopete-0.12b1/kopete/protocols/jabber/jabberprotocol.cpp 2006-03-08 09:25:21.000000000 +0800
|
||||
+++ kopete-0.12b1f/kopete/protocols/jabber/jabberprotocol.cpp 2006-03-14 20:03:51.000000000 +0800
|
||||
@@ -71,14 +71,15 @@
|
||||
|
||||
JabberProtocol::JabberProtocol (TQObject * parent, const char *name, const TQStringList &)
|
||||
: Kopete::Protocol( JabberProtocolFactory::instance(), parent, name ),
|
||||
- JabberKOSChatty(Kopete::OnlineStatus::Online, 100, this, JabberFreeForChat, "jabber_chatty", i18n ("Free for Chat"), i18n ("Free for Chat"), Kopete::OnlineStatusManager::FreeForChat, Kopete::OnlineStatusManager::HasAwayMessage ),
|
||||
- JabberKOSOnline(Kopete::OnlineStatus::Online, 90, this, JabberOnline, TQString::null, i18n ("Online"), i18n ("Online"), Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HasAwayMessage ),
|
||||
- JabberKOSAway(Kopete::OnlineStatus::Away, 80, this, JabberAway, "contact_away_overlay", i18n ("Away"), i18n ("Away"), Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HasAwayMessage),
|
||||
- JabberKOSXA(Kopete::OnlineStatus::Away, 70, this, JabberXA, "contact_xa_overlay", i18n ("Extended Away"), i18n ("Extended Away"), 0, Kopete::OnlineStatusManager::HasAwayMessage),
|
||||
- JabberKOSDND(Kopete::OnlineStatus::Away, 60, this, JabberDND, "contact_busy_overlay", i18n ("Do not Disturb"), i18n ("Do not Disturb"), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage),
|
||||
- JabberKOSOffline(Kopete::OnlineStatus::Offline, 50, this, JabberOffline, TQString::null, i18n ("Offline") ,i18n ("Offline"), Kopete::OnlineStatusManager::Offline, Kopete::OnlineStatusManager::HasAwayMessage ),
|
||||
- JabberKOSInvisible(Kopete::OnlineStatus::Invisible, 40, this, JabberInvisible, "contact_invisible_overlay", i18n ("Invisible") ,i18n ("Invisible"), Kopete::OnlineStatusManager::Invisible),
|
||||
- JabberKOSConnecting(Kopete::OnlineStatus::Connecting, 30, this, JabberConnecting, "jabber_connecting", i18n("Connecting")),
|
||||
+ JabberKOSChatty(Kopete::OnlineStatus::Online, 100, this, 1, "jabber_chatty", ("Free to Chat"), i18n ("Free to Chat"), Kopete::OnlineStatusManager::Online),
|
||||
+ JabberKOSOnline(Kopete::OnlineStatus::Online, 90, this, 0, TQString::null, ("Online"), i18n ("Online"), Kopete::OnlineStatusManager::Online),
|
||||
+ JabberKOSAway(Kopete::OnlineStatus::Away, 80, this, 2, "jabber_away", ("Away"), i18n ("Away"), Kopete::OnlineStatusManager::Busy,Kopete::OnlineStatusManager::HasAwayMessage),
|
||||
+ JabberKOSXA(Kopete::OnlineStatus::Away, 70, this, 3, "jabber_xa", ("Extended Away"), i18n ("Extended Away"), Kopete::OnlineStatusManager::Away),
|
||||
+ JabberKOSDND(Kopete::OnlineStatus::Away, 60, this, 4, "jabber_na", ("Do not Disturb"), i18n ("Do not Disturb"), Kopete::OnlineStatusManager::Away),
|
||||
+ JabberKOSOffline(Kopete::OnlineStatus::Offline, 50, this, 5, TQString::null, ("Offline") ,i18n ("Offline"), Kopete::OnlineStatusManager::Offline),
|
||||
+ JabberKOSInvisible(Kopete::OnlineStatus::Invisible, 40, this, 6, "jabber_invisible", ("Invisible") ,i18n ("Invisible"), Kopete::OnlineStatusManager::Invisible),
|
||||
+ JabberKOSConnecting(Kopete::OnlineStatus::Connecting, 30, this, 7, "jabber_connecting", i18n("Connecting")),
|
||||
+
|
||||
propLastSeen(Kopete::Global::Properties::self()->lastSeen()),
|
||||
propAwayMessage(Kopete::Global::Properties::self()->awayMessage()),
|
||||
propFirstName(Kopete::Global::Properties::self()->firstName()),
|
||||
diff -Nur kopete-0.12b1/kopete/protocols/msn/msnprotocol.cpp kopete-0.12b1f/kopete/protocols/msn/msnprotocol.cpp
|
||||
--- kopete-0.12b1/kopete/protocols/msn/msnprotocol.cpp 2006-03-08 09:25:24.000000000 +0800
|
||||
+++ kopete-0.12b1f/kopete/protocols/msn/msnprotocol.cpp 2006-03-14 20:03:51.000000000 +0800
|
||||
@@ -49,17 +49,17 @@
|
||||
|
||||
MSNProtocol::MSNProtocol( TQObject *parent, const char *name, const TQStringList & /* args */ )
|
||||
: Kopete::Protocol( MSNProtocolFactory::instance(), parent, name ),
|
||||
- NLN( Kopete::OnlineStatus::Online, 25, this, 1, TQString::null, i18n( "Online" ) , i18n( "O&nline" ), Kopete::OnlineStatusManager::Online,Kopete::OnlineStatusManager::HasAwayMessage ),
|
||||
- BSY( Kopete::OnlineStatus::Away, 20, this, 2, "msn_busy", i18n( "Busy" ) , i18n( "&Busy" ), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage ),
|
||||
- BRB( Kopete::OnlineStatus::Away, 22, this, 3, "msn_brb", i18n( "Be Right Back" ), i18n( "Be &Right Back" ) , 0 , Kopete::OnlineStatusManager::HasAwayMessage ),
|
||||
- AWY( Kopete::OnlineStatus::Away, 18, this, 4, "contact_away_overlay", i18n( "Away From Computer" ),i18n( "&Away" ), Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HasAwayMessage ),
|
||||
- PHN( Kopete::OnlineStatus::Away, 12, this, 5, "contact_phone_overlay", i18n( "On the Phone" ) , i18n( "On The &Phone" ) , 0 , Kopete::OnlineStatusManager::HasAwayMessage ),
|
||||
- LUN( Kopete::OnlineStatus::Away, 15, this, 6, "contact_food_overlay", i18n( "Out to Lunch" ) , i18n( "Out To &Lunch" ) , 0 , Kopete::OnlineStatusManager::HasAwayMessage ),
|
||||
- FLN( Kopete::OnlineStatus::Offline, 0, this, 7, TQString::null, i18n( "Offline" ) , i18n( "&Offline" ), Kopete::OnlineStatusManager::Offline,Kopete::OnlineStatusManager::DisabledIfOffline ),
|
||||
- HDN( Kopete::OnlineStatus::Invisible, 3, this, 8, "contact_invisible_overlay", i18n( "Invisible" ) , i18n( "&Invisible" ), Kopete::OnlineStatusManager::Invisible ),
|
||||
- IDL( Kopete::OnlineStatus::Away, 10, this, 9, "contact_away_overlay", i18n( "Idle" ) , i18n( "&Idle" ), Kopete::OnlineStatusManager::Idle , Kopete::OnlineStatusManager::HideFromMenu ),
|
||||
- UNK( Kopete::OnlineStatus::Unknown, 25, this, 0, "status_unknown", i18n( "Status not available" ) ),
|
||||
- CNT( Kopete::OnlineStatus::Connecting, 2, this, 10,"msn_connecting", i18n( "Connecting" ) ),
|
||||
+ NLN( Kopete::OnlineStatus::Online, 25, this, 1, TQString::null, ( "Online" ) , i18n( "O&nline" ), Kopete::OnlineStatusManager::Online ),
|
||||
+ BSY( Kopete::OnlineStatus::Away, 20, this, 2, "msn_busy", ( "Busy" ) , i18n( "&Busy" ), Kopete::OnlineStatusManager::Busy),
|
||||
+ BRB( Kopete::OnlineStatus::Away, 22, this, 3, "msn_brb", ( "Be Right Back" ), i18n( "Be &Right Back" )),
|
||||
+ AWY( Kopete::OnlineStatus::Away, 18, this, 4, "msn_away", ( "Away From Computer" ) , i18n( "&Away" ), Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HasAwayMessage ),
|
||||
+ PHN( Kopete::OnlineStatus::Away, 12, this, 5, "msn_phone", ( "On the Phone" ) , i18n( "On The &Phone" )),
|
||||
+ LUN( Kopete::OnlineStatus::Away, 15, this, 6, "msn_lunch", ( "Out to Lunch" ) , i18n( "Out To &Lunch" ) ),
|
||||
+ FLN( Kopete::OnlineStatus::Offline, 0, this, 7, TQString::null, ( "Offline" ) , i18n( "&Offline" ), Kopete::OnlineStatusManager::Offline , Kopete::OnlineStatusManager::DisabledIfOffline),
|
||||
+ HDN( Kopete::OnlineStatus::Invisible, 3, this, 8, "msn_invisible", ( "Invisible" ) , i18n( "&Invisible" ), Kopete::OnlineStatusManager::Invisible ),
|
||||
+ IDL( Kopete::OnlineStatus::Away, 10, this, 9, "msn_away", ( "Idle" ) , i18n( "&Idle" ), Kopete::OnlineStatusManager::Invisible ),
|
||||
+ UNK( Kopete::OnlineStatus::Unknown, 25, this, 0, "status_unknown",( "Status not available" ) ),
|
||||
+ CNT( Kopete::OnlineStatus::Connecting, 2, this, 10,"msn_connecting",( "Connecting" ) ),
|
||||
propEmail(Kopete::Global::Properties::self()->emailAddress()),
|
||||
propPhoneHome(Kopete::Global::Properties::self()->privatePhone()),
|
||||
propPhoneWork(Kopete::Global::Properties::self()->workPhone()),
|
||||
diff -Nur kopete-0.12b1/kopete/protocols/oscar/aim/aimprotocol.cpp kopete-0.12b1f/kopete/protocols/oscar/aim/aimprotocol.cpp
|
||||
--- kopete-0.12b1/kopete/protocols/oscar/aim/aimprotocol.cpp 2006-03-08 09:25:23.000000000 +0800
|
||||
+++ kopete-0.12b1f/kopete/protocols/oscar/aim/aimprotocol.cpp 2006-03-14 20:03:46.000000000 +0800
|
||||
@@ -220,14 +220,14 @@
|
||||
|
||||
AIMProtocol::AIMProtocol(TQObject *parent, const char *name, const TQStringList &)
|
||||
: Kopete::Protocol( AIMProtocolFactory::instance(), parent, name ),
|
||||
- statusOnline( Kopete::OnlineStatus::Online, 2, this, 0, TQString::null, i18n("Online"), i18n("Online"), Kopete::OnlineStatusManager::Online ),
|
||||
- statusOffline( Kopete::OnlineStatus::Offline, 2, this, 10, TQString::null, i18n("Offline"), i18n("Offline"), Kopete::OnlineStatusManager::Offline ),
|
||||
- statusAway( Kopete::OnlineStatus::Away, 2, this, 20, "contact_away_overlay", i18n("Away"), i18n("Away"), Kopete::OnlineStatusManager::Away,
|
||||
+ statusOnline( Kopete::OnlineStatus::Online, 2, this, 0, TQString::null, ("Online"), i18n("Online"), Kopete::OnlineStatusManager::Online ),
|
||||
+ statusOffline( Kopete::OnlineStatus::Offline, 2, this, 10, TQString::null, ("Offline"), i18n("Offline"), Kopete::OnlineStatusManager::Offline ),
|
||||
+ statusAway( Kopete::OnlineStatus::Away, 2, this, 20, "contact_away_overlay", ("Away"), i18n("Away"), Kopete::OnlineStatusManager::Away,
|
||||
Kopete::OnlineStatusManager::HasAwayMessage ),
|
||||
- statusWirelessOnline( Kopete::OnlineStatus::Online, 1, this, 30, "contact_phone_overlay", i18n("Mobile"), i18n("Mobile"),
|
||||
+ statusWirelessOnline( Kopete::OnlineStatus::Online, 1, this, 30, "contact_phone_overlay", ("Mobile"), i18n("Mobile"),
|
||||
Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HideFromMenu ),
|
||||
statusWirelessAway( Kopete::OnlineStatus::Away, 1, this, 31, TQStringList::split( " ", "contact_phone_overlay contact_away_overlay"),
|
||||
- i18n("Mobile Away"), i18n("Mobile Away"), Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HideFromMenu ),
|
||||
+ ("Mobile Away"), i18n("Mobile Away"), Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HideFromMenu ),
|
||||
statusConnecting(Kopete::OnlineStatus::Connecting, 99, this, 99, "aim_connecting", i18n("Connecting...")),
|
||||
awayMessage(Kopete::Global::Properties::self()->awayMessage()),
|
||||
clientFeatures("clientFeatures", i18n("Client Features"), 0, false),
|
||||
diff -Nur kopete-0.12b1/kopete/protocols/oscar/icq/icqpresence.cpp kopete-0.12b1f/kopete/protocols/oscar/icq/icqpresence.cpp
|
||||
--- kopete-0.12b1/kopete/protocols/oscar/icq/icqpresence.cpp 2006-03-08 09:25:23.000000000 +0800
|
||||
+++ kopete-0.12b1f/kopete/protocols/oscar/icq/icqpresence.cpp 2006-03-14 20:03:46.000000000 +0800
|
||||
@@ -68,13 +68,14 @@
|
||||
*/
|
||||
static const PresenceTypeData data[] =
|
||||
{
|
||||
- { Presence::Offline, OnlineStatus::Offline, OFFLINE, OFFLINE, i18n( "O&ffline" ), i18n("Offline"), i18n("Offline"), 0, "contact_invisible_overlay", Kopete::OnlineStatusManager::Offline, 0 },
|
||||
- { Presence::DoNotDisturb, OnlineStatus::Away, SET_DND, IS_DND, i18n( "&Do Not Disturb" ), i18n("Do Not Disturb"), i18n("Do Not Disturb (Invisible)"), "contact_busy_overlay", "contact_invisible_overlay", Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage },
|
||||
- { Presence::Occupied, OnlineStatus::Away, SET_OCC, IS_OCC, i18n( "O&ccupied" ), i18n("Occupied"), i18n("Occupied (Invisible)"), "contact_busy_overlay", "contact_invisible_overlay", 0, Kopete::OnlineStatusManager::HasAwayMessage },
|
||||
- { Presence::NotAvailable, OnlineStatus::Away, SET_NA, IS_NA, i18n( "Not A&vailable" ), i18n("Not Available"), i18n("Not Available (Invisible)"), "contact_xa_overlay", "contact_invisible_overlay", Kopete::OnlineStatusManager::ExtendedAway, Kopete::OnlineStatusManager::HasAwayMessage },
|
||||
- { Presence::Away, OnlineStatus::Away, SET_AWAY, IS_AWAY, i18n( "&Away" ), i18n("Away"), i18n("Away (Invisible)"), "contact_away_overlay", "contact_invisible_overlay", Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HasAwayMessage },
|
||||
- { Presence::FreeForChat, OnlineStatus::Online, SET_FFC, IS_FFC, i18n( "&Free for Chat" ), i18n("Free For Chat"), i18n("Free For Chat (Invisible)"), "icq_ffc", "contact_invisible_overlay", Kopete::OnlineStatusManager::FreeForChat, 0 },
|
||||
- { Presence::Online, OnlineStatus::Online, ONLINE, ONLINE, i18n( "O&nline" ), i18n("Online"), i18n("Online (Invisible)"), 0, "contact_invisible_overlay", Kopete::OnlineStatusManager::Online, 0 }
|
||||
+ { Presence::Offline, OnlineStatus::Offline, OFFLINE, OFFLINE, i18n( "O&ffline" ), ("Offline"), ("Offline"), 0, "contact_invisible_overlay", Kopete::OnlineStatusManager::Offline, 0 },
|
||||
+ { Presence::DoNotDisturb, OnlineStatus::Away, SET_DND, IS_DND, i18n( "&Do Not Disturb" ), ("Do Not Disturb"), i18n("Do Not Disturb (Invisible)"), "contact_busy_overlay", "contact_invisible_overlay", 0, Kopete::OnlineStatusManager::HasAwayMessage },
|
||||
+ { Presence::Occupied, OnlineStatus::Away, SET_OCC, IS_OCC, i18n( "O&ccupied" ), ("Occupied"), i18n("Occupied (Invisible)"), "contact_busy_overlay", "contact_invisible_overlay", Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage },
|
||||
+ { Presence::NotAvailable, OnlineStatus::Away, SET_NA, IS_NA, i18n( "Not A&vailable" ), ("Not Available"), i18n("Not Available (Invisible)"), "contact_xa_overlay", "contact_invisible_overlay", Kopete::OnlineStatusManager::ExtendedAway, Kopete::OnlineStatusManager::HasAwayMessage },
|
||||
+ { Presence::Away, OnlineStatus::Away, SET_AWAY, IS_AWAY, i18n( "&Away" ), ("Away"), i18n("Away (Invisible)"), "contact_away_overlay", "contact_invisible_overlay", Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HasAwayMessage },
|
||||
+ { Presence::FreeForChat, OnlineStatus::Online, SET_FFC, IS_FFC, i18n( "&Free for Chat" ), ("Free For Chat"), i18n("Free For Chat (Invisible)"), "icq_ffc", "contact_invisible_overlay", Kopete::OnlineStatusManager::FreeForChat, 0 },
|
||||
+ { Presence::Online, OnlineStatus::Online, ONLINE, ONLINE, i18n( "O&nline" ), ("Online"), i18n("Online (Invisible)"), 0, "contact_invisible_overlay", Kopete::OnlineStatusManager::Online, 0 }
|
||||
+
|
||||
};
|
||||
return data;
|
||||
}
|
||||
diff -Nur kopete-0.12b1/kopete/protocols/yahoo/yahooprotocol.cpp kopete-0.12b1f/kopete/protocols/yahoo/yahooprotocol.cpp
|
||||
--- kopete-0.12b1/kopete/protocols/yahoo/yahooprotocol.cpp 2006-03-08 09:25:14.000000000 +0800
|
||||
+++ kopete-0.12b1f/kopete/protocols/yahoo/yahooprotocol.cpp 2006-03-14 20:03:51.000000000 +0800
|
||||
@@ -39,20 +39,20 @@
|
||||
|
||||
YahooProtocol::YahooProtocol( TQObject *parent, const char *name, const TQStringList & )
|
||||
: Kopete::Protocol( YahooProtocolFactory::instance(), parent, name ),
|
||||
- Offline( Kopete::OnlineStatus::Offline, 0, this, 0x5a55aa56, TQString::null, i18n( "Offline" ), i18n( "Offline" ), Kopete::OnlineStatusManager::Offline ),
|
||||
- Online( Kopete::OnlineStatus::Online, 25, this, 0, TQString::null, i18n( "Online" ), i18n( "Online" ), Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HasAwayMessage ),
|
||||
- BeRightBack( Kopete::OnlineStatus::Away, 22, this, 1, "contact_away_overlay", i18n( "Be right back" ), i18n( "Be right back" ) ),
|
||||
- Busy( Kopete::OnlineStatus::Away, 20, this, 2, "contact_busy_overlay", i18n( "Busy" ), i18n( "Busy" ), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage ),
|
||||
- NotAtHome( Kopete::OnlineStatus::Away, 17, this, 3, "contact_xa_overlay", i18n( "Not at home" ), i18n( "Not at home" ), Kopete::OnlineStatusManager::ExtendedAway ),
|
||||
- NotAtMyDesk( Kopete::OnlineStatus::Away, 18, this, 4, "contact_xa_overlay", i18n( "Not at my desk"), i18n( "Not at my desk"), Kopete::OnlineStatusManager::Away ),
|
||||
- NotInTheOffice( Kopete::OnlineStatus::Away, 16, this, 5, "contact_xa_overlay", i18n( "Not in the office" ), i18n( "Not in the office" ) ),
|
||||
- OnThePhone( Kopete::OnlineStatus::Away, 12, this, 6, "contact_phone_overlay", i18n( "On the phone" ), i18n( "On the phone" ) ),
|
||||
- OnVacation( Kopete::OnlineStatus::Away, 3, this, 7, "contact_xa_overlay", i18n( "On vacation" ), i18n( "On vacation" ) ),
|
||||
- OutToLunch( Kopete::OnlineStatus::Away, 10, this, 8, "contact_food_overlay", i18n( "Out to lunch" ), i18n( "Out to lunch" ) ),
|
||||
- SteppedOut( Kopete::OnlineStatus::Away, 14, this, 9, "contact_away_overlay", i18n( "Stepped out" ), i18n( "Stepped out" ) ),
|
||||
- Invisible( Kopete::OnlineStatus::Invisible, 3, this, 12, "contact_invisible_overlay", i18n( "Invisible" ), i18n( "Invisible" ), Kopete::OnlineStatusManager::Invisible ),
|
||||
- Custom( Kopete::OnlineStatus::Away, 25, this, 99, "contact_busy_overlay", i18n( "Custom" ), i18n( "Custom" ), Kopete::OnlineStatusManager::HideFromMenu ),
|
||||
- Idle( Kopete::OnlineStatus::Away, 15, this, 999, "yahoo_idle", i18n( "Idle" ), i18n( "Idle" ), Kopete::OnlineStatusManager::Idle ),
|
||||
+ Offline( Kopete::OnlineStatus::Offline, 0, this, 0x5a55aa56, TQString::null, ( "Offline" ), i18n( "Offline" ), Kopete::OnlineStatusManager::Offline ),
|
||||
+ Online( Kopete::OnlineStatus::Online, 25, this, 0, TQString::null, ( "Online" ), i18n( "Online" ), Kopete::OnlineStatusManager::Online ),
|
||||
+ BeRightBack( Kopete::OnlineStatus::Away, 22, this, 1, "contact_away_overlay", ( "Be right back" ), i18n( "Be right back" ) ),
|
||||
+ Busy( Kopete::OnlineStatus::Away, 20, this, 2, "contact_busy_overlay", ( "Busy" ), i18n( "Busy" ), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage ),
|
||||
+ NotAtHome( Kopete::OnlineStatus::Away, 17, this, 3, "contact_xa_overlay", ( "Not at home" ), i18n( "Not at home" ), Kopete::OnlineStatusManager::ExtendedAway ),
|
||||
+ NotAtMyDesk( Kopete::OnlineStatus::Away, 18, this, 4, "contact_xa_overlay", ( "Not at my desk"), i18n( "Not at my desk"), Kopete::OnlineStatusManager::Away ),
|
||||
+ NotInTheOffice( Kopete::OnlineStatus::Away, 16, this, 5, "contact_xa_overlay", ( "Not in the office" ), i18n( "Not in the office" ) ),
|
||||
+ OnThePhone( Kopete::OnlineStatus::Away, 12, this, 6, "contact_phone_overlay", ( "On the phone" ), i18n( "On the phone" ) ),
|
||||
+ OnVacation( Kopete::OnlineStatus::Away, 3, this, 7, "contact_xa_overlay", ( "On vacation" ), i18n( "On vacation" ) ),
|
||||
+ OutToLunch( Kopete::OnlineStatus::Away, 10, this, 8, "contact_food_overlay", ( "Out to lunch" ), i18n( "Out to lunch" ) ),
|
||||
+ SteppedOut( Kopete::OnlineStatus::Away, 14, this, 9, "contact_away_overlay", ( "Stepped out" ), i18n( "Stepped out" ) ),
|
||||
+ Invisible( Kopete::OnlineStatus::Invisible, 3, this, 12, "contact_invisible_overlay", ( "Invisible" ), i18n( "Invisible" ), Kopete::OnlineStatusManager::Invisible ),
|
||||
+ Custom( Kopete::OnlineStatus::Away, 25, this, 99, "contact_busy_overlay", ( "Custom" ), i18n( "Custom" ), Kopete::OnlineStatusManager::HideFromMenu ),
|
||||
+ Idle( Kopete::OnlineStatus::Away, 15, this, 999, "yahoo_idle", ( "Idle" ), i18n( "Idle" ), Kopete::OnlineStatusManager::Idle ),
|
||||
Connecting( Kopete::OnlineStatus::Connecting,2, this, 555, "yahoo_connecting", i18n( "Connecting" ) ),
|
||||
awayMessage(Kopete::Global::Properties::self()->awayMessage()),
|
||||
iconCheckSum("iconCheckSum", i18n("Buddy Icon Checksum"), TQString::null, true, false, true),
|
||||
@ -1,132 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Startup script for LISa
|
||||
#
|
||||
# chkconfig: 345 92 8
|
||||
# description: Starts and stops the LAN Information Server used \
|
||||
# to provide a LAN browser.
|
||||
# processname: lisa
|
||||
#
|
||||
# based on rclisa Version 0.1
|
||||
# 2001 by Marcus Thiesen (marcus@thiesenweb.de) for SuSE Linux 7.1
|
||||
# This is free and comes with absolutely no WARRANTY
|
||||
# adapted for Mandrake 8.0 by Patrick Alberts (mandrake@alberts.org)
|
||||
# Updated for Mandrake 9.0 by Buchan Milne (bgmilne@linux-mandrake.com)
|
||||
#
|
||||
### BEGIN INIT INFO
|
||||
# Provides: lisa
|
||||
# Required-Start: $network
|
||||
# Required-Stop: $network
|
||||
# Default-Start: 3 5
|
||||
# Short-Description: LISa LAN Information Server
|
||||
# Description: Starts and stops the LAN Information Server used
|
||||
# to provide a LAN browser.
|
||||
### END INIT INFO
|
||||
|
||||
CONFIG_FILE=/etc/lisarc
|
||||
|
||||
prog="lisa"
|
||||
|
||||
# Source function library.
|
||||
if [ -f /etc/init.d/functions ] ; then
|
||||
. /etc/init.d/functions
|
||||
elif [ -f /etc/rc.d/init.d/functions ] ; then
|
||||
. /etc/rc.d/init.d/functions
|
||||
else
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Get config.
|
||||
. /etc/sysconfig/network
|
||||
|
||||
# Check that networking is up.
|
||||
if [ ${NETWORKING} = "no" ]
|
||||
then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# check how we were called
|
||||
case "$1" in
|
||||
start)
|
||||
PID=`pidof -s lisa`
|
||||
if [ -z "$PID" ]; then
|
||||
if [ -e /opt/kde3/bin/lisa ]; then
|
||||
|
||||
#check for config file and generate one if needed:
|
||||
if [ ! -e $CONFIG_FILE ];then
|
||||
gprintf "No config file, generating one, please run kcontrol as root to customise\n"
|
||||
# See http://lisa-home.sourceforge.net/ for more details
|
||||
# on the config file format.
|
||||
# PingAddresses/AllowedAddresses should only be route
|
||||
# entries that are not gateways,loopback or multicast:
|
||||
IPNMS_ALL=`/sbin/route -n |awk 'BEGIN {ORS=";"};$4=="U"&&$8!="lo"&&$1!~/224.0.0.0/ {print $1"/"$3}'`
|
||||
# BroadcastNetwork should be only the internal subnet,
|
||||
# take first route from above:
|
||||
IPNMS=`/sbin/route -n |awk ' $4=="U"&&$8!="lo"&&$1!~/224.0.0.0/&&$8!~/ppp.*/ {print $1"/"$3}'|head -n1`
|
||||
echo "SecondWait=-1"> $CONFIG_FILE
|
||||
echo "SearchUsingNmblookup=1">> $CONFIG_FILE
|
||||
echo "DeliverUnnamedHosts=0" >>$CONFIG_FILE
|
||||
echo "FirstWait=30" >> $CONFIG_FILE
|
||||
echo "MaxPingsAtOnce=256" >>$CONFIG_FILE
|
||||
echo "UpdatePeriod=300" >> $CONFIG_FILE
|
||||
#echo "PingAddresses=$IPNMS_ALL">> $CONFIG_FILE
|
||||
echo "AllowedAddresses=$IPNMS_ALL" >> $CONFIG_FILE
|
||||
echo "BroadcastNetwork=$IPNMS" >>$CONFIG_FILE
|
||||
#echo "PingNames=" >> $CONFIG_FILE
|
||||
fi
|
||||
|
||||
if [ -e $CONFIG_FILE ]; then
|
||||
action "Starting %s: " "$prog" /bin/true
|
||||
/opt/kde3/bin/lisa -c $CONFIG_FILE >/dev/null 2>&1
|
||||
else
|
||||
action "No configuration available, not starting LISa" /bin/false
|
||||
fi
|
||||
|
||||
else
|
||||
action "Starting %s: binaries not found " "$prog" /bin/false
|
||||
fi
|
||||
else
|
||||
action "Starting %s: already running (%s) " "$PID" "$prog" /bin/false
|
||||
fi
|
||||
touch /var/lock/subsys/lisa
|
||||
;;
|
||||
|
||||
stop)
|
||||
PID=`pidof -s lisa`
|
||||
if [ "$PID" ]; then
|
||||
action "Stopping %s: " "$prog" kill -3 $PID
|
||||
fi
|
||||
rm -f /var/lock/subsys/lisa
|
||||
;;
|
||||
|
||||
status)
|
||||
PID=`pidof -s lisa`
|
||||
if [ "$PID" ]; then
|
||||
gprintf "%s is running! ($PID)\n" "$prog"
|
||||
/usr/bin/kill -s SIGUSR1 $PID
|
||||
sleep 3
|
||||
else
|
||||
gprintf "%s is not running!\n" "$prog" ;
|
||||
fi
|
||||
;;
|
||||
|
||||
restart)
|
||||
$0 stop && $0 start
|
||||
;;
|
||||
|
||||
refresh)
|
||||
PID=`pidof -s lisa`
|
||||
if [ "$PID" ]; then
|
||||
gprintf "Sending %s a SIGHUP ($PID)\n" "$prog"
|
||||
kill -SIGHUP $PID;
|
||||
else
|
||||
gprintf "%s is not running!\n" "$prog" ;
|
||||
fi
|
||||
;;
|
||||
|
||||
*)
|
||||
gprintf "usage: %s {start|stop|status|refresh|restart}\n" $0
|
||||
;;
|
||||
esac
|
||||
|
||||
exit 0
|
||||
@ -1,5 +0,0 @@
|
||||
#%PAM-1.0
|
||||
auth sufficient pam_rootok.so
|
||||
auth include system-auth
|
||||
session optional pam_xauth.so
|
||||
account required pam_permit.so
|
||||
@ -1,95 +0,0 @@
|
||||
/*
|
||||
This file is part of KitchenSync.
|
||||
|
||||
Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
|
||||
Copyright (c) 2008 Eduardo Habkost <ehabkost@raisama.net>
|
||||
Copyright (c) 2008 Adam Williamson <awilliamson@mandriva.com>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||
USA.
|
||||
*/
|
||||
|
||||
#include "configguibarry.h"
|
||||
|
||||
#include <klocale.h>
|
||||
|
||||
#include <qlayout.h>
|
||||
#include <qlabel.h>
|
||||
#include <qdom.h>
|
||||
#include <qlineedit.h>
|
||||
#include <qcheckbox.h>
|
||||
|
||||
ConfigGuiBarry::ConfigGuiBarry( const QSync::Member &member, QWidget *parent )
|
||||
: ConfigGui( member, parent )
|
||||
{
|
||||
QBoxLayout *userLayout = new QHBoxLayout( topLayout() );
|
||||
|
||||
QLabel *pinLbl= new QLabel( i18n("PIN:"), this );
|
||||
userLayout->addWidget(pinLbl);
|
||||
|
||||
mPin = new QLineEdit(this);
|
||||
userLayout->addWidget(mPin);
|
||||
|
||||
mCalendar = new QCheckBox( i18n("Sync calendar"), this );
|
||||
userLayout->addWidget( mCalendar );
|
||||
|
||||
mContacts = new QCheckBox( i18n("Sync contacts"), this );
|
||||
userLayout->addWidget( mContacts );
|
||||
|
||||
topLayout()->addStretch( 1 );
|
||||
}
|
||||
|
||||
void ConfigGuiBarry::load(const QString &cfg)
|
||||
{
|
||||
QStringList lines = QStringList::split( '\n', cfg);
|
||||
QString pin;
|
||||
uint cal = 0;
|
||||
uint con = 0;
|
||||
for ( QStringList::Iterator it = lines.begin(); it != lines.end(); ++it ) {
|
||||
QStringList options = QStringList::split( ' ', *it);
|
||||
if (options.count() < 1)
|
||||
/* invalid line */
|
||||
continue;
|
||||
|
||||
if( options[0].lower() == "device" )
|
||||
{
|
||||
if (options.count() < 2)
|
||||
/* invalid line */
|
||||
continue;
|
||||
|
||||
pin = options[1];
|
||||
if (options.count() >= 3)
|
||||
cal = options[2].toUInt();
|
||||
if (options.count() >= 4)
|
||||
con = options[3].toUInt();
|
||||
|
||||
mPin->setText(pin);
|
||||
mCalendar->setChecked( cal != 0);
|
||||
mContacts->setChecked( con != 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
QString ConfigGuiBarry::save() const
|
||||
{
|
||||
QString cfg;
|
||||
cfg = "Device " + mPin->text();
|
||||
if ( mCalendar->isChecked() ) cfg += " 1";
|
||||
else cfg += " 0";
|
||||
if ( mContacts->isChecked() ) cfg += " 1";
|
||||
else cfg += " 0";
|
||||
|
||||
return cfg;
|
||||
}
|
||||
@ -1,43 +0,0 @@
|
||||
/*
|
||||
This file is part of KitchenSync.
|
||||
|
||||
Copyright (c) 2005 Cornelius Schumacher <schumacher@kde.org>
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
|
||||
USA.
|
||||
*/
|
||||
#ifndef CONFIGGUIBARRY_H
|
||||
#define CONFIGGUIBARRY_H
|
||||
|
||||
#include "configgui.h"
|
||||
|
||||
class QLineEdit;
|
||||
class QCheckBox;
|
||||
|
||||
class ConfigGuiBarry : public ConfigGui
|
||||
{
|
||||
public:
|
||||
ConfigGuiBarry( const QSync::Member &, QWidget *parent );
|
||||
|
||||
void load( const QString &cfg );
|
||||
QString save() const;
|
||||
|
||||
private:
|
||||
QLineEdit *mPin;
|
||||
QCheckBox *mCalendar;
|
||||
QCheckBox *mContacts;
|
||||
};
|
||||
|
||||
#endif
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,8 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ -x /usr/bin/kontact ] && [ ! -z $(/sbin/pidof kontact) ]; then
|
||||
kontact --module kaddressbook
|
||||
else
|
||||
kaddressbook $*
|
||||
fi
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ -x /usr/bin/kontact ] && [ ! -z $(/sbin/pidof kontact) ]; then
|
||||
kontact --module akregator
|
||||
else
|
||||
akregator $*
|
||||
fi
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ -x /usr/bin/kontact ] && [ ! -z $(/sbin/pidof kontact) ]; then
|
||||
kontact --module kmail
|
||||
else
|
||||
kmail $*
|
||||
fi
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ -x /usr/bin/kontact ] && [ ! -z $(/sbin/pidof kontact) ]; then
|
||||
kontact --module knode
|
||||
else
|
||||
knode $*
|
||||
fi
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ -x /usr/bin/kontact ] && [ ! -z $(/sbin/pidof kontact) ]; then
|
||||
kontact --module knotes
|
||||
else
|
||||
knotes $*
|
||||
fi
|
||||
|
||||
@ -1,8 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
if [ -x /usr/bin/kontact ] && [ ! -z $(/sbin/pidof kontact) ]; then
|
||||
kontact --module korganizer
|
||||
else
|
||||
korganizer $*
|
||||
fi
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- kdepim/kmail/kmmsgbase.cpp-- 2005-04-15 20:04:03.000000000 +0200
|
||||
+++ kdepim/kmail/kmmsgbase.cpp 2005-04-15 20:04:25.000000000 +0200
|
||||
@@ -144,7 +144,7 @@ void KMMsgBase::toggleStatus(const KMMsg
|
||||
if (aStatus == KMMsgStatusHam)
|
||||
mStatus &= ~KMMsgStatusSpam;
|
||||
}
|
||||
- if (storage()) {
|
||||
+ if (oldStatus != mStatus && storage()) {
|
||||
if (idx < 0)
|
||||
idx = storage()->find( this );
|
||||
storage()->msgStatusChanged( oldStatus, status(), idx );
|
||||
@ -1,31 +0,0 @@
|
||||
--- kdepim-3.4.0/kmail/kmkernel.cpp-- 2005-04-07 10:46:16.522963291 -0400
|
||||
+++ kdepim-3.4.0/kmail/kmkernel.cpp 2005-04-07 10:58:04.836316900 -0400
|
||||
@@ -1069,6 +1069,7 @@ void KMKernel::init()
|
||||
cfg->writeEntry("previous-version", KMAIL_VERSION);
|
||||
TQString foldersPath = cfg->readPathEntry( "folders" );
|
||||
kdDebug(5006) << k_funcinfo << "foldersPath (from config): '" << foldersPath << "'" << endl;
|
||||
+ bool migrateMail = true;
|
||||
|
||||
if ( foldersPath.isEmpty() ) {
|
||||
foldersPath = localDataPath() + "mail";
|
||||
@@ -1369,6 +1370,20 @@ bool KMKernel::transferMail( QString & d
|
||||
}
|
||||
|
||||
if ( dir.isEmpty() ) {
|
||||
+ // check whether the user has a ~/.Mail folder
|
||||
+ fi.setFile( TQDir::home(), ".Mail" );
|
||||
+ if ( fi.exists() && fi.isDir() &&
|
||||
+ TQFile::exists( TQDir::homeDirPath() + "/.Mail/.inbox.index" ) ) {
|
||||
+ // there's a ~/Mail folder which seems to be used by KMail (because of the
|
||||
+ // index file)
|
||||
+ dir = TQDir::homeDirPath() + "/.Mail";
|
||||
+ // the following two lines can be removed once moving mail is reactivated
|
||||
+ destinationDir = dir;
|
||||
+ return true;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ if ( dir.isEmpty() ) {
|
||||
return true; // there's no old mail folder
|
||||
}
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
--- kdepim-3.4.2/knode/knmainwidget.cpp-- 2005-08-01 13:32:58.000000000 +0200
|
||||
+++ kdepim-3.4.2/knode/knmainwidget.cpp 2005-08-01 13:33:06.000000000 +0200
|
||||
@@ -253,11 +253,12 @@ KNMainWidget::KNMainWidget( KXMLGUIClien
|
||||
c_olView->setFocus();
|
||||
|
||||
setStatusMsg();
|
||||
-
|
||||
+#if 0
|
||||
if( firstStart() ) { // open the config dialog on the first start
|
||||
show(); // the settings dialog must appear in front of the main window!
|
||||
slotSettings();
|
||||
}
|
||||
+#endif
|
||||
}
|
||||
|
||||
KNMainWidget::~KNMainWidget()
|
||||
@ -1,16 +0,0 @@
|
||||
--- kdepim-3.5.4/kalarm/kalarmapp.cpp-- 2006-07-27 15:15:07.000000000 +0200
|
||||
+++ kdepim-3.5.4/kalarm/kalarmapp.cpp 2006-07-27 15:16:29.000000000 +0200
|
||||
@@ -746,7 +746,12 @@
|
||||
}
|
||||
|
||||
args->clear(); // free up memory
|
||||
- if (!initCheck())
|
||||
+ /* Instead of calling initCheck (), call initCheck (true) to check the calendar only.
|
||||
+ * This works because it doesn't change the return value:
|
||||
+ * If the return value is false, it doesn't matter because we exit.
|
||||
+ * If the return value is true, the first thing MainWindow() does, is to call initCheck(), so we do the same tests.
|
||||
+ * Jonas Wustrack - jwustrack@mandriva.com */
|
||||
+ if (!initCheck(true))
|
||||
{
|
||||
exitCode = 1;
|
||||
break;
|
||||
@ -1,36 +0,0 @@
|
||||
--- kdepim-3.5.4/korganizer/koprefsdialog.cpp-- 2006-07-27 19:50:56.000000000 +0200
|
||||
+++ kdepim-3.5.4/korganizer/koprefsdialog.cpp 2006-07-27 19:58:12.000000000 +0200
|
||||
@@ -193,13 +193,27 @@ class KOPrefsDialogTime : public KPrefsM
|
||||
pclose(f);
|
||||
}
|
||||
#else
|
||||
- if((f = fopen("/etc/timezone", "r")) != NULL) {
|
||||
- // get the currently set timezone
|
||||
- fgets(tempstring, 100, f);
|
||||
- tempstring[strlen(tempstring) - 1] = '\0';
|
||||
- sCurrentlySet = TQString(tempstring);
|
||||
- fclose(f);
|
||||
+ TQFile file( "/etc/sysconfig/clock" );
|
||||
+ if( file.exists())
|
||||
+ {
|
||||
+ TQString line;
|
||||
+ if ( file.open( IO_ReadOnly ) ) {
|
||||
+ TQTextStream stream( &file );
|
||||
+ while ( !stream.atEnd() )
|
||||
+ {
|
||||
+ line = stream.readLine(); // line of text excluding '\n'
|
||||
+ if( line.contains("ZONE")!=0)
|
||||
+ {
|
||||
+ line = line.remove("ZONE=");
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ file.close();
|
||||
+ }
|
||||
+ if(!line.isEmpty())
|
||||
+ sCurrentlySet = line;
|
||||
}
|
||||
+
|
||||
#endif // !USE_SOLARIS
|
||||
|
||||
mTimeZoneCombo->insertItem(i18n("[No selection]"));
|
||||
@ -1,10 +0,0 @@
|
||||
--- kdepim-3.5.4/kmail/accountwizard.cpp.fix 2007-03-29 12:53:21.000000000 -0300
|
||||
+++ kdepim-3.5.4/kmail/accountwizard.cpp 2007-03-29 14:06:35.000000000 -0300
|
||||
@@ -111,6 +111,7 @@
|
||||
: KWizard( parent, "KWizard" ), mKernel( kernel ),
|
||||
mAccount( 0 ), mTransportInfo( 0 ), mServerTest( 0 )
|
||||
{
|
||||
+ helpButton()->hide();
|
||||
setupWelcomePage();
|
||||
setupAccountTypePage();
|
||||
setupAccountInformationPage();
|
||||
@ -1,11 +0,0 @@
|
||||
--- ./kontact/plugins/knode/knodeplugin.desktop~ 2008-02-13 10:39:52.000000000 +0100
|
||||
+++ ./kontact/plugins/knode/knodeplugin.desktop 2008-02-21 08:09:12.000000000 +0100
|
||||
@@ -12,7 +12,7 @@
|
||||
X-KDE-PluginInfo-Name=kontact_knodeplugin
|
||||
X-KDE-PluginInfo-Version=0.1
|
||||
X-KDE-PluginInfo-License=GPL
|
||||
-X-KDE-PluginInfo-EnabledByDefault=false
|
||||
+X-KDE-PluginInfo-EnabledByDefault=true
|
||||
|
||||
Comment=Newsreader Component (KNode Plugin)
|
||||
Comment[bg]=Приставка за KNode
|
||||
@ -1,27 +0,0 @@
|
||||
Index: kdepim-3.5.9/indexlib/Makefile.am
|
||||
===================================================================
|
||||
--- kdepim-3.5.9/indexlib/Makefile.am
|
||||
+++ kdepim-3.5.9/indexlib/Makefile.am 2008-06-06 23:56:40.000000000 +0300
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
lib_LTLIBRARIES = libindex.la
|
||||
|
||||
+libindex_la_LIBADD = -lz
|
||||
libindex_la_SOURCES = bitstream.cpp compressed.cpp create.cpp exception.cpp ifile.cpp leafdata.cpp leafdatavector.cpp lockfile.cpp logfile.cpp match.cpp mmap_manager.cpp quotes.cpp slow.cpp stringarray.cpp stringset.cpp tokenizer.cpp
|
||||
|
||||
indexlibincludedir=$(includedir)/index
|
||||
Index: kdepim-3.5.9/kontact/src/Makefile.am
|
||||
===================================================================
|
||||
--- kdepim-3.5.9/kontact/src/Makefile.am
|
||||
+++ kdepim-3.5.9/kontact/src/Makefile.am 2008-06-07 14:40:39.000000000 +0300
|
||||
@@ -4,7 +4,9 @@
|
||||
|
||||
lib_LTLIBRARIES = libkontact.la
|
||||
libkontact_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -version-info 1:0
|
||||
-libkontact_la_LIBADD = $(LIB_KDECORE)
|
||||
+# Use C++ linking mode; automake autodetection does not work here:
|
||||
+libkontact_la_LIBTOOLFLAGS = --tag=CXX
|
||||
+libkontact_la_LIBADD = $(LIB_QT) $(LIB_KDECORE)
|
||||
libkontact_la_SOURCES = prefs.kcfgc
|
||||
|
||||
bin_PROGRAMS = kontact
|
||||
@ -1,48 +0,0 @@
|
||||
--- kdepim-3.5.9/kitchensync/src/configgui.cpp 2007-10-08 02:50:47.000000000 -0700
|
||||
+++ kdepim-3.5.9/kitchensync/src/configgui.cpp.new 2008-03-14 01:10:51.000000000 -0700
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "configgui.h"
|
||||
|
||||
|
||||
+#include "configguibarry.h"
|
||||
#include "configguiblank.h"
|
||||
#include "configguifile.h"
|
||||
#include "configguignokii.h"
|
||||
@@ -91,6 +92,8 @@
|
||||
return new ConfigGuiSyncmlHttp( member, parent );
|
||||
} else if ( name == "opie-sync" ) {
|
||||
return new ConfigGuiOpie( member, parent );
|
||||
+ } else if ( name == "barry-sync" ) {
|
||||
+ return new ConfigGuiBarry( member, parent );
|
||||
} else if ( name == "gnokii-sync" ) {
|
||||
return new ConfigGuiGnokii( member, parent );
|
||||
} else if ( name == "gpe-sync" ) {
|
||||
--- kdepim-3.5.9/kitchensync/src/Makefile.am 2007-10-08 02:50:47.000000000 -0700
|
||||
+++ kdepim-3.5.9/kitchensync/src/Makefile.am.new 2008-03-14 01:11:58.000000000 -0700
|
||||
@@ -30,7 +30,7 @@
|
||||
configguisyncmlobex.cpp configguisyncmlhttp.cpp configguiopie.cpp \
|
||||
configguignokii.cpp configguigcalendar.cpp configguildap.cpp configguigpe.cpp \
|
||||
configguijescs.cpp configguievo2.cpp configguimoto.cpp configguisynce.cpp \
|
||||
- configguisunbird.cpp
|
||||
+ configguisunbird.cpp configguibarry.cpp
|
||||
libkitchensync_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined
|
||||
libkitchensync_la_LIBADD = $(LIB_KIO) $(LIB_KHTML) $(top_builddir)/kitchensync/libqopensync/libqopensync.la \
|
||||
$(LIB_KABC) $(top_builddir)/libkdepim/libkdepim.la $(top_builddir)/libkcal/libkcal.la
|
||||
--- kdepim-3.5.9/kitchensync/src/memberinfo.cpp 2007-10-08 02:50:47.000000000 -0700
|
||||
+++ kdepim-3.5.9/kitchensync/src/memberinfo.cpp.new 2008-03-14 01:09:09.000000000 -0700
|
||||
@@ -53,6 +53,7 @@
|
||||
nameMap.insert( "palm-sync", i18n( "Palm" ) );
|
||||
nameMap.insert( "kdepim-sync", i18n( "KDE PIM" ) );
|
||||
nameMap.insert( "kio-sync", i18n( "Remote File" ) );
|
||||
+ nameMap.insert( "barry-sync", i18n( "Blackberry" ) );
|
||||
nameMap.insert( "irmc-sync", i18n( "Mobile Phone" ) );
|
||||
nameMap.insert( "evo2-sync", i18n( "Evolution" ) );
|
||||
nameMap.insert( "opie-sync", i18n( "Handheld" ) );
|
||||
@@ -80,6 +81,7 @@
|
||||
if ( pluginName == "palm-sync" ) return "pda_black";
|
||||
if ( pluginName == "kdepim-sync" ) return "kontact";
|
||||
if ( pluginName == "kio-sync" ) return "network";
|
||||
+ if ( pluginName == "barry-sync" ) return "pda_black";
|
||||
if ( pluginName == "irmc-sync" ) return "mobile_phone";
|
||||
if ( pluginName == "evo2-sync" ) return "evolution";
|
||||
if ( pluginName == "opie-sync" ) return "pda_blue";
|
||||
@ -1,37 +0,0 @@
|
||||
diff -bur kdepim-3.5.10/kitchensync/src/configgui.cpp kdepim-3.5.10-new/kitchensync/src/configgui.cpp
|
||||
--- kdepim-3.5.10/kitchensync/src/configgui.cpp 2007-10-08 09:50:47.000000000 +0000
|
||||
+++ kdepim-3.5.10-new/kitchensync/src/configgui.cpp 2009-11-16 12:27:21.000000000 +0000
|
||||
@@ -108,7 +108,9 @@
|
||||
} else if ( name == "moto-sync" ) {
|
||||
return new ConfigGuiMoto( member, parent );
|
||||
} else if ( name == "synce-plugin" ) {
|
||||
- return new ConfigGuiSynce( member, parent );
|
||||
+ return new ConfigGuiBlank( member, parent );
|
||||
+ } else if ( name == "synce-opensync-plugin" ) {
|
||||
+ return new ConfigGuiBlank( member, parent );
|
||||
} else if ( name == "sunbird-sync" ) {
|
||||
return new ConfigGuiSunbird( member, parent );
|
||||
} else {
|
||||
Only in kdepim-3.5.10-new/kitchensync/src: configgui.cpp.orig
|
||||
diff -bur kdepim-3.5.10/kitchensync/src/memberinfo.cpp kdepim-3.5.10-new/kitchensync/src/memberinfo.cpp
|
||||
--- kdepim-3.5.10/kitchensync/src/memberinfo.cpp 2007-10-08 09:50:47.000000000 +0000
|
||||
+++ kdepim-3.5.10-new/kitchensync/src/memberinfo.cpp 2009-11-16 12:27:21.000000000 +0000
|
||||
@@ -65,7 +65,8 @@
|
||||
nameMap.insert( "gpe-sync", i18n( "Handheld" ) );
|
||||
nameMap.insert( "sunbird-sync", i18n( "Sunbird Calendar" ) );
|
||||
nameMap.insert( "jescs-sync", i18n( "Java Enterprise System Calendar" ) );
|
||||
- nameMap.insert( "synce-plugin", i18n( "WinCE Devices" ) );
|
||||
+ nameMap.insert( "synce-plugin", i18n( "Windows Mobile 2003 and earlier Devices" ) );
|
||||
+ nameMap.insert( "synce-opensync-plugin", i18n( "Windows Mobile 5 and later Devices" ) );
|
||||
}
|
||||
|
||||
if ( mMember.name().isEmpty() )
|
||||
@@ -84,6 +85,7 @@
|
||||
if ( pluginName == "evo2-sync" ) return "evolution";
|
||||
if ( pluginName == "opie-sync" ) return "pda_blue";
|
||||
if ( pluginName == "synce-plugin" ) return "pda_blue";
|
||||
+ if ( pluginName == "synce-opensync-plugin" ) return "pda_blue";
|
||||
if ( pluginName == "ldap-sync" ) return "contents2";
|
||||
if ( pluginName == "syncml-obex-client" ) return "mobile_phone";
|
||||
if ( pluginName == "syncml-http-server" ) return "pda_blue";
|
||||
Only in kdepim-3.5.10-new/kitchensync/src: memberinfo.cpp.orig
|
||||
@ -1,16 +0,0 @@
|
||||
diff -p -up kdepim-3.5.9/kalarm/kalarmd/kalarmd.autostart.desktop.ONLY_KDE3 kdepim-3.5.9/kalarm/kalarmd/kalarmd.autostart.desktop
|
||||
--- kdepim-3.5.9/kalarm/kalarmd/kalarmd.autostart.desktop.ONLY_KDE3 2008-07-04 13:49:13.000000000 -0300
|
||||
+++ kdepim-3.5.9/kalarm/kalarmd/kalarmd.autostart.desktop 2008-07-04 13:50:20.000000000 -0300
|
||||
@@ -100,3 +100,4 @@ NoDisplay=true
|
||||
X-KDE-autostart-phase=2
|
||||
X-KDE-autostart-condition=kalarmdrc:General:Autostart:false
|
||||
X-KDE-StartupNotify=true
|
||||
+OnlyShowIn=KDE;
|
||||
diff -p -up kdepim-3.5.9/kalarm/kalarm.tray.desktop.ONLY_KDE3 kdepim-3.5.9/kalarm/kalarm.tray.desktop
|
||||
--- kdepim-3.5.9/kalarm/kalarm.tray.desktop.ONLY_KDE3 2008-07-04 13:52:08.000000000 -0300
|
||||
+++ kdepim-3.5.9/kalarm/kalarm.tray.desktop 2008-07-04 14:05:04.000000000 -0300
|
||||
@@ -72,3 +72,4 @@ Comment[zh_TW]=警示/提醒訊息排程
|
||||
Terminal=false
|
||||
X-KDE-autostart-phase=2
|
||||
X-KDE-autostart-condition=kalarmrc:General:AutostartTrayDummy:false
|
||||
+OnlyShowIn=KDE;
|
||||
@ -1,845 +0,0 @@
|
||||
|
||||
%define branch 0
|
||||
%define oname kdesdk
|
||||
%define lib_name_orig lib%{oname}
|
||||
%define lib_oldname %mklibname %{oname} %lib_major
|
||||
%define lib_major 1
|
||||
%define lib_name %mklibname %{name} %lib_major
|
||||
|
||||
Name: kde3-%{oname}
|
||||
Summary: K Desktop Environment - Software Development Kit
|
||||
Version: 3.5.12
|
||||
Release: %mkrel 1
|
||||
Epoch: 1
|
||||
License: GPL
|
||||
URL: http://www.kde.org
|
||||
Source: ftp://ftp.kde.org/pub/kde/stable/%version/src/%oname-%version.tar.bz2
|
||||
#Patch1: kdesdk-3.5.9-fix-underlinking.patch
|
||||
#Patch2: kdesdk-3.5.10-antlr.patch
|
||||
Patch3: kde-3.5.10-acinclude.patch
|
||||
#Patch4: fix_autotools.patch
|
||||
Patch5: kdebase-3.5.12-move-xdg-menu-dir.patch
|
||||
Patch6: kdebase-3.5.12-config.patch
|
||||
Group: Graphical desktop/KDE3
|
||||
BuildRoot: %_tmppath/%name-%version-%release-root
|
||||
|
||||
Provides: %{oname}3 = %epoch:%version-%release
|
||||
Provides: %{oname} = %epoch:%version-%release
|
||||
Obsoletes: %{oname}3
|
||||
Obsoletes: %{oname}
|
||||
Requires: automake >= 1.8
|
||||
Requires: autoconf >= 1:2.59
|
||||
BuildRequires: db4-devel
|
||||
BuildRequires: freetype2-devel
|
||||
BuildRequires: kdelibs-devel
|
||||
BuildRequires: bzip2-devel
|
||||
BuildRequires: jpeg-devel
|
||||
BuildRequires: lcms-devel
|
||||
BuildRequires: mng-devel
|
||||
BuildRequires: png-devel
|
||||
BuildRequires: qt3-devel
|
||||
BuildRequires: zlib-devel
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
%endif
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
BuildRequires: automake >= 1.7
|
||||
BuildRequires: kde3-macros
|
||||
BuildRequires: flex
|
||||
BuildRequires: binutils-devel
|
||||
BuildRequires: subversion-devel
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: mesaglut-devel
|
||||
BuildRequires: libx11-devel
|
||||
|
||||
%description
|
||||
Software Development Kit for the K Desktop Environment.
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%_kde3_bindir/*
|
||||
%doc %_kde3_docdir/HTML/en/kbugbuster
|
||||
%doc %_kde3_docdir/HTML/en/kdesvn-build
|
||||
%_kde3_iconsdir/*/*/*/kuiviewer*
|
||||
%_kde3_iconsdir/*/*/*/kbugbuster*
|
||||
%_kde3_appsdir/katepart/syntax/kdesvn-buildrc.xml
|
||||
%_kde3_libdir/kde3/*
|
||||
%_mandir/man1/kde-build*
|
||||
%_mandir/man1/includemocs*
|
||||
%_mandir/man1/kdesvn-build*
|
||||
%_kde3_appsdir/kstyle/*
|
||||
%_kde3_datadir/applications/kde/kbugbuster.desktop
|
||||
%_kde3_datadir/applications/kde/kuiviewer.desktop
|
||||
%dir %_kde3_appsdir/kbugbuster
|
||||
%_kde3_appsdir/kbugbuster/*
|
||||
%dir %_kde3_appsdir/kapptemplate/
|
||||
%_kde3_appsdir/kapptemplate/*
|
||||
%dir %_kde3_appsdir/kuiviewer/
|
||||
%_kde3_appsdir/kuiviewer/*
|
||||
%dir %_kde3_appsdir/kuiviewerpart/
|
||||
%_kde3_appsdir/kuiviewerpart/*
|
||||
%_kde3_datadir/servicetypes/*
|
||||
%_kde3_appsdir/kmtrace/kde.excludes
|
||||
%_kde3_appsdir/kabc/*
|
||||
%_kde3_datadir/services/*
|
||||
%exclude %_kde3_bindir/kbabel
|
||||
%exclude %_kde3_bindir/kbabeldict
|
||||
%exclude %_kde3_bindir/catalogmanager
|
||||
%exclude %_kde3_bindir/kcachegrind
|
||||
%exclude %_kde3_bindir/po2xml
|
||||
%exclude %_kde3_bindir/split2po
|
||||
%exclude %_kde3_bindir/swappo
|
||||
%exclude %_kde3_bindir/transxx
|
||||
%exclude %_kde3_bindir/xml2pot
|
||||
%exclude %_kde3_libdir/kde3/kbabel*
|
||||
%exclude %_kde3_libdir/kde3/kfile_po*
|
||||
%exclude %_kde3_libdir/kde3/pothumbnail*
|
||||
%exclude %_kde3_bindir/cervisia
|
||||
%exclude %_kde3_bindir/cvsaskpass
|
||||
%exclude %_kde3_bindir/cvsservice
|
||||
%exclude %_kde3_bindir/umbrello
|
||||
%exclude %_kde3_bindir/kompare
|
||||
%exclude %_kde3_datadir/services/cvsservice.desktop
|
||||
%exclude %_kde3_datadir/services/kbabel_*.desktop
|
||||
%exclude %_kde3_datadir/services/po*.desktop
|
||||
%exclude %_kde3_datadir/services/dbsea*.desktop
|
||||
%exclude %_kde3_datadir/services/kfile_po.desktop
|
||||
%exclude %_kde3_datadir/services/tmx*.desktop
|
||||
%exclude %_kde3_datadir/services/kompare*
|
||||
%exclude %_kde3_datadir/servicetypes/kbabel*.desktop
|
||||
%exclude %_kde3_datadir/servicetypes/kompareviewpart.desktop
|
||||
%exclude %_kde3_datadir/servicetypes/komparenavigationpart.desktop
|
||||
%exclude %_kde3_libdir/kde3/libcervisiapart.*
|
||||
%exclude %_kde3_libdir/kde3/cervisia.*
|
||||
%exclude %_kde3_libdir/kde3/cvsaskpass.*
|
||||
%exclude %_kde3_libdir/kde3/cvsservice.*
|
||||
%exclude %_kde3_libdir/kde3/libkompare*
|
||||
%exclude %_kde3_libdir/libkdeinit_cervisia.*
|
||||
%exclude %_kde3_libdir/libkdeinit_cvsaskpass.*
|
||||
%exclude %_kde3_libdir/libkdeinit_cvsservice.*
|
||||
|
||||
#---------------------------------------------------------------
|
||||
|
||||
%package -n %lib_name
|
||||
Summary: Lib files for kdesdk
|
||||
Group: System/Libraries
|
||||
Conflicts: kdesdk <= 3.1.94-13mdk
|
||||
Conflicts: %lib_name-kbabel <= 3.3.2-1mdk
|
||||
Provides: %lib_name_orig = %epoch:%version-%release
|
||||
Provides: %lib_oldname = %epoch:%version-%release
|
||||
Obsoletes: %lib_name_orig
|
||||
Obsoletes: %lib_oldname
|
||||
|
||||
%description -n %lib_name
|
||||
Lib files for kdesdk
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n %lib_name -p /sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %lib_name -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files -n %lib_name
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_libdir/libkompareinterface.la
|
||||
%_kde3_libdir/libkompareinterface.so.*
|
||||
%_kde3_libdir/libkspy.so.*
|
||||
%_kde3_libdir/libkspy.la
|
||||
%_kde3_libdir/kmtrace/libktrace.la
|
||||
%_kde3_libdir/kmtrace/libktrace.so
|
||||
%_kde3_libdir/kmtrace/libktrace_s.a
|
||||
%_kde3_libdir/libkunittestgui.so.*
|
||||
%_kde3_libdir/libkunittestgui.la
|
||||
|
||||
#---------------------------------------------------------------
|
||||
|
||||
%package umbrello
|
||||
Summary: UML Modeller
|
||||
Group: Graphical desktop/KDE3
|
||||
Provides: umbrello3 = %epoch:%version-%release
|
||||
Provides: kde3-umbrello = %epoch:%version-%release
|
||||
Provides: %{oname}-umbrello = %epoch:%version-%release
|
||||
Obsoletes: %{oname}-umbrello
|
||||
Conflicts: kdesdk <= 3.1.94-13mdk
|
||||
|
||||
%description umbrello
|
||||
Umbrello UML Modeller is a UML diagramming tool for KDE.
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post umbrello
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun umbrello
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files umbrello
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_bindir/umbrello
|
||||
%_kde3_datadir/applications/kde/umbrello.desktop
|
||||
%doc %_kde3_docdir/HTML/en/umbrello
|
||||
%dir %_kde3_appsdir/umbrello/
|
||||
%_kde3_appsdir/umbrello/*
|
||||
%_kde3_iconsdir/*/*/*/umbrello*
|
||||
%_kde3_datadir/mimelnk/application/x-umbrello.desktop
|
||||
|
||||
#---------------------------------------------------------------
|
||||
|
||||
%package cervisia
|
||||
Summary: CVS client part
|
||||
Group: Graphical desktop/KDE3
|
||||
Requires: cvs
|
||||
Requires: %lib_name-cervisia = %epoch:%version-%release
|
||||
Provides: cervisia3 = %epoch:%version-%release
|
||||
Provides: kde3-cervisia = %epoch:%version-%release
|
||||
Provides: %{oname}-cervisia = %epoch:%version-%release
|
||||
Obsoletes: %{oname}-cervisia
|
||||
Conflicts: kdesdk <= 3.1.94-13mdk
|
||||
|
||||
|
||||
%description cervisia
|
||||
CVS client part.
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post cervisia
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun cervisia
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files cervisia
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_bindir/cervisia
|
||||
%_kde3_bindir/cvsaskpass
|
||||
%_kde3_bindir/cvsservice
|
||||
%_kde3_appsdir/kconf_update/cervisia-change_repos_list.pl
|
||||
%_kde3_appsdir/kconf_update/cervisia-normalize_cvsroot.pl
|
||||
%_kde3_iconsdir/*/*/*/cervisia*
|
||||
%_kde3_iconsdir/*/*/*/vcs*
|
||||
%_kde3_iconsdir/*/*/*/svn*
|
||||
%_kde3_appsdir/konqueror/servicemenus/subversion*
|
||||
%_mandir/man1/cervisia*
|
||||
%_mandir/man1/cvs*
|
||||
%_mandir/man1/noncvslist*
|
||||
%_kde3_datadir/config.kcfg/cervisiapart.kcfg
|
||||
%dir %_kde3_appsdir/cervisia/
|
||||
%_kde3_appsdir/cervisia/*
|
||||
%_kde3_datadir/applications/kde/cervisia.desktop
|
||||
%doc %_kde3_docdir/HTML/en/cervisia
|
||||
%dir %_kde3_appsdir/cervisiapart/
|
||||
%_kde3_appsdir/cervisiapart/*
|
||||
%_kde3_appsdir/kconf_update/cervisia.upd
|
||||
%_kde3_appsdir/kconf_update/change_colors.pl
|
||||
%_kde3_appsdir/kconf_update/move_repositories.pl
|
||||
%_kde3_datadir/services/cvsservice.desktop
|
||||
%_kde3_libdir/kde3/libcervisiapart.*
|
||||
%_kde3_libdir/kde3/cervisia.*
|
||||
%_kde3_libdir/kde3/cvsaskpass.*
|
||||
%_kde3_libdir/kde3/cvsservice.*
|
||||
%_kde3_libdir/libkdeinit_cervisia.*
|
||||
%_kde3_libdir/libkdeinit_cvsaskpass.*
|
||||
%_kde3_libdir/libkdeinit_cvsservice.*
|
||||
|
||||
#---------------------------------------------------------------
|
||||
|
||||
%package kompare
|
||||
Summary: KDE diff graphic tool
|
||||
Group: Graphical desktop/KDE3
|
||||
Provides: kompare3 = %epoch:%version-%release
|
||||
Provides: kde3-kompare = %epoch:%version-%release
|
||||
Provides: %{oname}-kompare = %epoch:%version-%release
|
||||
Obsoletes: %{oname}-kompare
|
||||
Conflicts: kdesdk < 3.5.9-2
|
||||
|
||||
%description kompare
|
||||
kompare is a KDE diff graphic tool
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post kompare
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun kompare
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files kompare
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_bindir/kompare
|
||||
%doc %_kde3_docdir/HTML/en/kompare
|
||||
%_kde3_datadir/applications/kde/kompare.desktop
|
||||
%_kde3_datadir/servicetypes/kompareviewpart.desktop
|
||||
%_kde3_libdir/kde3/libkomparenavtreepart.la
|
||||
%_kde3_libdir/kde3/libkomparenavtreepart.so
|
||||
%_kde3_libdir/kde3/libkomparepart.la
|
||||
%_kde3_libdir/kde3/libkomparepart.so
|
||||
%_kde3_datadir/services/komparenavtreepart.desktop
|
||||
%_kde3_datadir/services/komparepart.desktop
|
||||
%_kde3_datadir/servicetypes/komparenavigationpart.desktop
|
||||
%dir %_kde3_appsdir/kompare/
|
||||
%_kde3_appsdir/kompare/*
|
||||
%_kde3_iconsdir/*/*/*/kompare*
|
||||
|
||||
#---------------------------------------------------------------
|
||||
|
||||
%package kcachegrind
|
||||
Summary: KCachegrind
|
||||
Group: Graphical desktop/KDE3
|
||||
Requires: valgrind
|
||||
Provides: kcachegrind3 = %epoch:%version-%release
|
||||
Provides: kde3-kcachegrind = %epoch:%version-%release
|
||||
Provides: %{oname}-kcachegrind = %epoch:%version-%release
|
||||
Obsoletes: %{oname}-kcachegrind
|
||||
Conflicts: kdesdk <= 3.1.94-13mdk
|
||||
|
||||
%description kcachegrind
|
||||
KCachegrind is a visualisation tool for the profiling data generated by
|
||||
Cachegrind and Calltree (they profile data file format is upwards compatible).
|
||||
Calltree extends Cachegrind, which is part of Valgrind.
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post kcachegrind
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun kcachegrind
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files kcachegrind
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_bindir/kcachegrind
|
||||
%doc %_kde3_docdir/HTML/en/kcachegrind
|
||||
%_kde3_iconsdir/*/*/*/kcachegrind*
|
||||
%dir %_kde3_appsdir/kcachegrind/
|
||||
%_kde3_appsdir/kcachegrind/*
|
||||
%_kde3_datadir/mimelnk/application/x-kcachegrind.desktop
|
||||
%_kde3_datadir/applications/kde/kcachegrind.desktop
|
||||
|
||||
#---------------------------------------------------------------
|
||||
|
||||
%package po2xml
|
||||
Summary: Xml2po and vice versa converters
|
||||
Group: Graphical desktop/KDE3
|
||||
Provides: kde3-po2xml = %epoch:%version-%release
|
||||
Provides: %{oname}-xml2pot = %epoch:%version-%release
|
||||
Provides: %{oname}-po2xml = %epoch:%version-%release
|
||||
Obsoletes: %{oname}-po2xml
|
||||
Conflicts: kdesdk <= 3.5.6-4mdk
|
||||
|
||||
%description po2xml
|
||||
An xml2po and vice versa converters.
|
||||
|
||||
%files po2xml
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_bindir/po2xml
|
||||
%_kde3_bindir/split2po
|
||||
%_kde3_bindir/swappo
|
||||
%_kde3_bindir/transxx
|
||||
%_kde3_bindir/xml2pot
|
||||
|
||||
#---------------------------------------------------------------
|
||||
|
||||
%package kbabel
|
||||
Summary: Set of tools for editing and managing gettext PO files
|
||||
Group: Graphical desktop/KDE3
|
||||
Requires: %lib_name-kbabel = %epoch:%version-%release
|
||||
Requires: gettext
|
||||
Provides: kbabel3 = %epoch:%version-%release
|
||||
Provides: kde3-kbabel = %epoch:%version-%release
|
||||
Provides: %{oname}-kbabel = %epoch:%version-%release
|
||||
Obsoletes: %{oname}-kbabel
|
||||
Conflicts: kdesdk <= 3.1.94-13mdk
|
||||
|
||||
%description kbabel
|
||||
KBabel is a set of tools for editing and managing gettext PO files.
|
||||
Main part is a powerful and comfortable PO file editor which features
|
||||
full navigation capabilities, full editing functionality, possibility
|
||||
to search for translations in different dictionaries, spell and
|
||||
syntax checking, showing diffs and many more. Also included is a
|
||||
"Catalog Manager", a file manager view which helps keeping an overview
|
||||
of PO files. Last but not least it includes a standalone
|
||||
dictionary application as an additional possibility to access KBabel's
|
||||
powerful dictionaries.
|
||||
KBabel will help you to translate fast and also keep consistent translations.
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post kbabel
|
||||
%update_menus
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun kbabel
|
||||
%clean_menus
|
||||
%endif
|
||||
|
||||
%files kbabel
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_bindir/kbabel
|
||||
%_kde3_bindir/kbabeldict
|
||||
%_kde3_bindir/catalogmanager
|
||||
%_kde3_datadir/applications/kde/kbabel.desktop
|
||||
%_kde3_datadir/applications/kde/kbabeldict.desktop
|
||||
%_kde3_datadir/applications/kde/catalogmanager.desktop
|
||||
%_kde3_iconsdir/*/*/*/catalogmanager*
|
||||
%_kde3_iconsdir/*/*/*/kbabel*
|
||||
%dir %_kde3_appsdir/kbabel
|
||||
%_kde3_appsdir/kbabel/*
|
||||
%_kde3_appsdir/kconf_update/kbabel-difftoproject.upd
|
||||
%_kde3_appsdir/kconf_update/kbabel-project.upd
|
||||
%_kde3_appsdir/kconf_update/kbabel-projectrename.upd
|
||||
%_kde3_datadir/config.kcfg/kbabel.kcfg
|
||||
%_kde3_datadir/config.kcfg/kbprojectsettings.kcfg
|
||||
%dir %_kde3_appsdir/catalogmanager
|
||||
%_kde3_appsdir/catalogmanager/*
|
||||
%doc %_kde3_docdir/HTML/en/kbabel
|
||||
%_kde3_datadir/services/kbabel_*.desktop
|
||||
%_kde3_datadir/services/po*.desktop
|
||||
%_kde3_datadir/services/dbsea*.desktop
|
||||
%_kde3_datadir/services/kfile_po.desktop
|
||||
%_kde3_datadir/services/tmx*.desktop
|
||||
%_kde3_datadir/servicetypes/kbabel*.desktop
|
||||
|
||||
#---------------------------------------------------------------
|
||||
|
||||
%package -n %lib_name-kbabel
|
||||
Summary: Library files for KBabel
|
||||
Group: System/Libraries
|
||||
Provides: %lib_oldname-kbabel = %epoch:%version-%release
|
||||
Obsoletes: %lib_oldname-kbabel
|
||||
Conflicts: kdesdk <= 3.1.94-13mdk
|
||||
|
||||
%description -n %lib_name-kbabel
|
||||
Library files for KBabel.
|
||||
|
||||
%files -n %lib_name-kbabel
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_libdir/libkbabelcommon.so.*
|
||||
%_kde3_libdir/libkbabelcommon.la
|
||||
%_kde3_libdir/libkbabeldictplugin.la
|
||||
%_kde3_libdir/libkbabeldictplugin.so.*
|
||||
%_kde3_libdir/kde3/kbabel*.so
|
||||
%_kde3_libdir/kde3/kbabel*.la
|
||||
%_kde3_libdir/kde3/kfile_po.so
|
||||
%_kde3_libdir/kde3/kfile_po.la
|
||||
%_kde3_libdir/kde3/pothumbnail.so
|
||||
%_kde3_libdir/kde3/pothumbnail.la
|
||||
|
||||
#---------------------------------------------------------------
|
||||
|
||||
%package -n %lib_name-cervisia
|
||||
Summary: Library for CVS client part
|
||||
Group: System/Libraries
|
||||
Conflicts: kdesdk <= 3.1.94-13mdk
|
||||
Provides: %lib_name_orig-cervisia = %epoch:%version-%release
|
||||
Provides: %lib_oldname-cervisia = %epoch:%version-%release
|
||||
Obsoletes: %lib_oldname-cervisia
|
||||
|
||||
%description -n %lib_name-cervisia
|
||||
Library for CVS client part.
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n %lib_name-cervisia -p /sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %lib_name-cervisia -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files -n %lib_name-cervisia
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_libdir/libcvsservice.la
|
||||
%_kde3_libdir/libcvsservice.so.*
|
||||
|
||||
#---------------------------------------------------------------
|
||||
|
||||
%package devel
|
||||
Summary: Devel files for kdesdk
|
||||
Group: Development/KDE and Qt
|
||||
Requires: %lib_name-cervisia = %epoch:%version-%release
|
||||
Conflicts: kdesdk <= 3.1.94-13mdk
|
||||
Obsoletes: %lib_name-cervisia-devel < 1:3.5.9
|
||||
Provides: %lib_name-cervisia-devel = %epoch:%version
|
||||
Obsoletes: %lib_name-kbabel-devel < 1:3.5.9
|
||||
Provides: %lib_name-kbabel-devel = %epoch:%version
|
||||
Obsoletes: %lib_name-devel < 1:3.5.9
|
||||
Provides: %lib_name-devel = %epoch:%version
|
||||
Provides: %lib_oldname-devel = %epoch:%version-%release
|
||||
Obsoletes: %lib_oldname-devel
|
||||
|
||||
%description devel
|
||||
Devel files for kdesdk.
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_includedir/*
|
||||
%_kde3_libdir/libcvsservice.so
|
||||
%_kde3_libdir/libkbabelcommon.so
|
||||
%_kde3_libdir/libkbabeldictplugin.so
|
||||
%_kde3_libdir/libkompareinterface.so
|
||||
%_kde3_libdir/libkspy.so
|
||||
%_kde3_libdir/libkunittestgui.so
|
||||
|
||||
#---------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
%setup -q -n %{oname}-%{version}
|
||||
#%patch1 -p0 -b .underlinking
|
||||
#%patch2 -p1
|
||||
%if %mdkversion >= 201000
|
||||
%patch3 -p1
|
||||
#%patch4 -p1
|
||||
%patch5 -p0
|
||||
%patch6 -p0
|
||||
%endif
|
||||
|
||||
%build
|
||||
export QTDIR=%qt3dir
|
||||
|
||||
PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
|
||||
export xdg_menudir=%_sysconfdir/xdg/kde/menus
|
||||
|
||||
make -f admin/Makefile.common cvs
|
||||
|
||||
%configure_kde3 \
|
||||
--with-apr-config=%_bindir/apr-1-config \
|
||||
--with-apu-config=%_bindir/apu-1-config \
|
||||
--with-svn-include=%_includedir
|
||||
|
||||
%make
|
||||
|
||||
%install
|
||||
rm -fr %buildroot
|
||||
|
||||
make install DESTDIR=%buildroot
|
||||
|
||||
rm -f %buildroot/%_kde3_docdir/HTML/en/kbabel/TODO
|
||||
|
||||
%clean
|
||||
rm -fr %buildroot
|
||||
|
||||
|
||||
%changelog
|
||||
|
||||
* Mon Jul 25 2011 Tim Williams <tim@my-place.org.uk> 1:3.5.12-1mvt2010.2
|
||||
+ Update to trinity 2.5.12 sources
|
||||
- Remove fix_autotools.patch, kdesdk-3.5.9-fix-underlinking.patch, kdesdk-3.5.10-antlr.patch
|
||||
+ Add kdebase-3.5.12-move-xdg-menu-dir.patch, kdebase-3.5.12-config.patch
|
||||
|
||||
* Mon Jul 19 2010 Tim Williams <tim@my-place.org.uk> 1:3.5.10-4mvt2010.0
|
||||
+ Rebuild for MDV 2010.1
|
||||
|
||||
* Mon Jan 18 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:3.5.10-3mvt2010.0
|
||||
- Rebuild for 2010.0
|
||||
- Change package name to avoid KDE4 upgrade
|
||||
+ KDE builds with autoconf 2.65, add patch for this and
|
||||
set autoconf to version 2.65:patch3
|
||||
+ Fix automake 1.11 issue:patch4
|
||||
|
||||
* Mon Nov 16 2009 Tim Williams <tim@my-place.org.uk> 1:3.5.10-2mdv2010.0
|
||||
+ Rebuild for MDV 2010.0
|
||||
|
||||
* Thu Aug 28 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.10-1mdv2009.0
|
||||
+ Revision: 277089
|
||||
- remove spurious build requires on kdepim-devel
|
||||
- Latest kde 3 upstream package
|
||||
|
||||
* Fri Aug 08 2008 Thierry Vignaud <tvignaud@mandriva.com> 1:3.5.9-8mdv2009.0
|
||||
+ Revision: 267779
|
||||
- rebuild early 2009.0 package (before pixel changes)
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
|
||||
- do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
|
||||
|
||||
* Sat Jun 07 2008 Funda Wang <fundawang@mandriva.org> 1:3.5.9-7mdv2009.0
|
||||
+ Revision: 216755
|
||||
- readd svn plugin
|
||||
- fix svn include dir
|
||||
- add underlinking patch
|
||||
- rebuild for new qt3 libdir
|
||||
|
||||
* Mon May 19 2008 Rodrigo Gonçalves de Oliveira <rodrigo@mandriva.com> 1:3.5.9-6mdv2009.0
|
||||
+ Revision: 209006
|
||||
- User versioned obsoletes
|
||||
|
||||
* Thu May 08 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-5mdv2009.0
|
||||
+ Revision: 204009
|
||||
- Move to /opt
|
||||
|
||||
* Sat Mar 22 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.9-4mdv2008.1
|
||||
+ Revision: 189496
|
||||
- Fix groups ( tks to pterjan)
|
||||
|
||||
* Mon Mar 03 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.9-3mdv2008.1
|
||||
+ Revision: 177822
|
||||
- Fix file list
|
||||
|
||||
* Mon Feb 18 2008 Thierry Vignaud <tvignaud@mandriva.com> 1:3.5.9-2mdv2008.1
|
||||
+ Revision: 170922
|
||||
- rebuild
|
||||
- fix "foobar is blabla" summary (=> "blabla") so that it looks nice in rpmdrake
|
||||
|
||||
* Fri Feb 15 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-1mdv2008.1
|
||||
+ Revision: 169004
|
||||
- Get away from branches. Last KDE 3 arriving !!
|
||||
- Removed post-3.5.8 patches integrated
|
||||
- Obsolete worng lib devel packages to one devel package to rule then all
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- fix summary-not-capitalized
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- Fix file list for kompare
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
* Wed Dec 26 2007 Danilo Cesar Lemes de Paula <danilo@mandriva.com> 1:3.5.8-3mdv2008.1
|
||||
+ Revision: 137902
|
||||
- Changing the release to rebuild this package
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
|
||||
* Sat Nov 17 2007 Funda Wang <fundawang@mandriva.org> 1:3.5.8-2mdv2008.1
|
||||
+ Revision: 109225
|
||||
- rebuild for new lzma
|
||||
|
||||
* Sun Oct 28 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.8-1mdv2008.1
|
||||
+ Revision: 102855
|
||||
- Kde 3.5.8
|
||||
Remove merged patch
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- fix summary-ended-with-dot
|
||||
|
||||
* Thu Sep 13 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.7-3mdv2008.0
|
||||
+ Revision: 85381
|
||||
- [BUGFIX] Apply upstream patch to handle correclty CVS in cervisia (BUG #30497)'
|
||||
Remove Hardcoded Packager Tag
|
||||
|
||||
+ Funda Wang <fundawang@mandriva.org>
|
||||
- Remove 2006 conditions
|
||||
- More provides for po2xml
|
||||
|
||||
* Wed May 16 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-1mdv2008.0
|
||||
+ Revision: 27458
|
||||
- 3.5.7 release
|
||||
|
||||
* Wed May 16 2007 Funda Wang <fundawang@mandriva.org> 1:3.5.6-4mdv2008.0
|
||||
+ Revision: 27249
|
||||
- split po2xml tools.
|
||||
- Remove changelog entries.
|
||||
|
||||
|
||||
* Mon Mar 05 2007 Laurent Montel <lmontel@mandriva.com> 3.5.6-3mdv2007.0
|
||||
+ Revision: 133246
|
||||
- Just cervisia needs cvs
|
||||
|
||||
* Thu Mar 01 2007 Laurent Montel <lmontel@mandriva.com> 1:3.5.6-2mdv2007.1
|
||||
+ Revision: 130569
|
||||
- Fix kbugbuster mandriva address
|
||||
- 3.5.6
|
||||
- Fix spec file
|
||||
|
||||
* Mon Oct 30 2006 Laurent Montel <lmontel@mandriva.com> 1:3.5.5-5mdv2007.1
|
||||
+ Revision: 73733
|
||||
- Subversion -1.4 doesn't have svn-config program
|
||||
=> check into kdesdk doesn't work (for the moment)
|
||||
=> disable it
|
||||
- Fix buildrequires
|
||||
- Rebuild
|
||||
- Rebuild
|
||||
- New release (2006/08/02 -3.5.4-mdv)
|
||||
--enable-new-ldflags doesn't work on x86_64
|
||||
- Rebuild for x86_64
|
||||
- Fix with new valgrind
|
||||
- 3.5.33.5.33.5.3
|
||||
- Rebuild against new xorg
|
||||
- Rebuild to generate new category
|
||||
- 3.5.2
|
||||
- Fix man page
|
||||
- 3.5.1
|
||||
- Real kde3.5
|
||||
- 3.5.0 (named rc1)
|
||||
- Fix typo
|
||||
* Wed Nov 02 2005 Laurent MONTEL <lmontel@mandriva.com> 3.3.5-3mdk
|
||||
- Rebuild with new mysql
|
||||
* Thu Oct 27 2005 Helio Chissini de Castro <helio@mandriva.com> 3.3.5-2mdk
|
||||
- New immodule patch
|
||||
- 3.4.92
|
||||
- Rebuild
|
||||
- Now it's necessary to use --libsuffix
|
||||
- Add patch from neoclust (without remove xfree bugzilla) fix kde bug #102873
|
||||
- Remove debug
|
||||
Add diff
|
||||
- 3.4.2
|
||||
|
||||
+ Helio Chissini de Castro <helio@mandriva.com>
|
||||
- Back to use branch tarballs. Now using post 3.5.5
|
||||
- Updated spec. The spec layout was too old and not match with current kde specs
|
||||
on mandriva
|
||||
- Added missing subveriosn support on cervisia
|
||||
- We are Mandriva now
|
||||
- Uploading package ./kdesdk
|
||||
|
||||
+ Andreas Hasenack <andreas@mandriva.com>
|
||||
- renamed mdv to packages because mdv is too generic and it's hosting only packages anyway
|
||||
|
||||
* Wed May 18 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-6mdk
|
||||
- Fix requires on automake1.7 for kdeapptemplate (bug found by qa)
|
||||
|
||||
* Thu May 05 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-5mdk
|
||||
- Rebuild with new gcc
|
||||
|
||||
* Sat Apr 23 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-4mdk
|
||||
- Fix debug flag
|
||||
|
||||
* Sun Apr 17 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-4mdk
|
||||
- Activate visibility same as for ppc
|
||||
- Add comment to remove patch for kde 3.5 (patch commited into kde head)
|
||||
|
||||
* Wed Apr 13 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-3mdk
|
||||
- Reapply patch4: fix compile on x86_64
|
||||
|
||||
* Tue Apr 12 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.4.0-2mdk
|
||||
- Reactivate debug
|
||||
- Change email
|
||||
- Use --enable-new-ldflags
|
||||
|
||||
* Thu Apr 07 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.4.0-1mdk
|
||||
- 3.4.0
|
||||
|
||||
* Mon Feb 14 2005 Gwenole Beauchesne <gbeauchesne@mandrakesoft.com> 3.3.2-11mdk
|
||||
- fix build on x86_64
|
||||
|
||||
* Fri Feb 11 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-10mdk
|
||||
- Fix build on x86_64 (can't compile kmtrace and co)
|
||||
|
||||
* Thu Feb 10 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-9mdk
|
||||
- Disable debug
|
||||
|
||||
* Fri Jan 28 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-8mdk
|
||||
- Fix menu entry
|
||||
|
||||
* Mon Jan 24 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-7mdk
|
||||
- Disable visibility for ppc
|
||||
|
||||
* Wed Jan 19 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-6mdk
|
||||
- Requires on valgrind plugins MDK bug #13096
|
||||
|
||||
* Thu Jan 13 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-5mdk
|
||||
- Use -fvisibility
|
||||
|
||||
* Tue Dec 28 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-4mdk
|
||||
- Sync with CVS
|
||||
|
||||
* Tue Dec 14 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-3mdk
|
||||
- Fix conflict
|
||||
|
||||
* Wed Dec 08 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-2mdk
|
||||
- Fix menu
|
||||
|
||||
* Tue Nov 30 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-1mdk
|
||||
- 3.3.2
|
||||
|
||||
* Fri Oct 29 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-4mdk
|
||||
- Requires gettext for kbabel fix MDK kde bug #12156
|
||||
|
||||
* Thu Oct 28 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-3mdk
|
||||
- bye-bye %%buildfor
|
||||
|
||||
* Tue Oct 12 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-2mdk
|
||||
- Deprecated mdk < 9.2
|
||||
|
||||
* Sat Oct 09 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-1mdk
|
||||
- 3.3.1
|
||||
|
||||
* Thu Sep 23 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-2mdk
|
||||
- Sync with kde 3.3 brnach
|
||||
|
||||
* Fri Sep 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-1mdk
|
||||
- 3.3.0
|
||||
|
||||
* Thu Aug 26 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-12mdk
|
||||
- Add patch4: fix kbabel mem leak
|
||||
|
||||
* Tue Aug 17 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-11mdk
|
||||
- Add patch3: fix kompare
|
||||
|
||||
* Sat Aug 14 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-10mdk
|
||||
- Rebuild for new menu translation table
|
||||
|
||||
* Tue Aug 10 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-9mdk
|
||||
- Remove debug
|
||||
|
||||
* Fri Jul 30 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-8mdk
|
||||
- Sync with CVS
|
||||
|
||||
* Sat Jul 24 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-7mdk
|
||||
- Fix spec file
|
||||
|
||||
* Thu Jul 22 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-6mdk
|
||||
- Fix remove rpath
|
||||
|
||||
* Fri Jul 09 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-5mdk
|
||||
- Add patch1: fix kde bug #83018
|
||||
"Disable 'Diff' button until the dialog appears so the user doesn't
|
||||
accidentilly opens the same diff several times."
|
||||
|
||||
* Wed Jul 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-4mdk
|
||||
- Rebuild with new kdelibs
|
||||
|
||||
* Tue Jul 06 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-3mdk
|
||||
- Remove patch3 not necessary (break build under MDK10.0)
|
||||
|
||||
* Tue Jun 29 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-2mdk
|
||||
- Fix build requires
|
||||
|
||||
* Tue Jun 15 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-1mdk
|
||||
- 3.2.3
|
||||
|
||||
* Fri Jun 04 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-7mdk
|
||||
- Rebuild
|
||||
|
||||
* Wed Jun 02 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-6mdk
|
||||
- Rebuild with debug
|
||||
|
||||
* Sat May 22 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-5mdk
|
||||
- Add buildrequires
|
||||
|
||||
* Thu May 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-4mdk
|
||||
- kcachgrind can read also gprof file => change requires on valgrind to
|
||||
specific ix86
|
||||
|
||||
* Wed May 19 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-3mdk
|
||||
- Merge Gb amd64 fix (kcachegrind is ix86 specific)
|
||||
|
||||
* Fri May 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-2mdk
|
||||
- Fix some rpmlint error
|
||||
|
||||
* Tue Apr 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-1mdk
|
||||
- 3.2.2
|
||||
|
||||
* Wed Apr 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.1-2mdk
|
||||
- Fix spec file for using rpmbuildupdate
|
||||
|
||||
* Fri Apr 02 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.1-1mdk
|
||||
- 3.2.1
|
||||
|
||||
* Wed Mar 31 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-12mdk
|
||||
- use mdkverion
|
||||
- use %%configure
|
||||
|
||||
* Wed Mar 24 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-11mdk
|
||||
- Fix compile under amd64 (patch gb)
|
||||
|
||||
@ -1,470 +0,0 @@
|
||||
%define oname kdetoys
|
||||
%define compile_apidox 1
|
||||
%{?_no_apidox: %{expand: %%global compile_apidox 0}}
|
||||
|
||||
%define lib_name_orig %mklibname kde3-kdetoys
|
||||
%define lib_major 1
|
||||
%define lib_name %lib_name_orig%lib_major
|
||||
%define lib_name_old %mklibname kdetoys
|
||||
%define lib_oldname %lib_name_old%lib_major
|
||||
|
||||
Name: kde3-%{oname}
|
||||
Summary: K Desktop Environment - Toys and Amusements
|
||||
Version: 3.5.12
|
||||
Release: %mkrel 1
|
||||
Epoch: 1
|
||||
URL: http://www.kde.org
|
||||
Source: ftp://ftp.kde.org/pub/kde/stable/%version/src/%oname-%version.tar.bz2
|
||||
Patch0: kdetoys-3.5.6-fix-screensaver-nodisplay.patch
|
||||
Patch1: kde-3.5.10-acinclude.patch
|
||||
#Patch2: fix_autotools.patch
|
||||
Group: Graphical desktop/KDE3
|
||||
BuildRoot: %_tmppath/%name-%version-%release-root
|
||||
License: GPL
|
||||
Provides: kteatime3
|
||||
Provides: kde3-kteatime
|
||||
Obsoletes: kdetoys3.0
|
||||
Obsoletes: kdetoys3
|
||||
Provides: kdetoys3 = %epoch:%version-%release
|
||||
Provides: %{oname}3 = %epoch:%version-%release
|
||||
Provides: %{oname} = %epoch:%version-%release
|
||||
Obsoletes: %{oname}3
|
||||
Obsoletes: %{oname}
|
||||
Obsoletes: %lib_name
|
||||
BuildRequires: X11-devel
|
||||
BuildRequires: kdelibs-devel
|
||||
BuildRequires: qt3-devel
|
||||
BuildRequires: kde3-macros
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
%endif
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
BuildRequires: automake >= 1.7
|
||||
|
||||
%description
|
||||
Toys for the K Desktop Environment.
|
||||
|
||||
Software included in this package are:
|
||||
- amor: Amusing Misuse Of Resources put's comic figures above your windows
|
||||
- eyesapplet: a kicker applet similar to XEyes
|
||||
- fifteenapplet: kicker applet, order 15 pieces in a 4x4 square by moving them
|
||||
- kmoon: system tray applet showing the moon phase
|
||||
- kodo: mouse movement meter
|
||||
- kscore: kicker applet with a sports ticker
|
||||
- kteatime: system tray applet that makes sure your tea doesn't get too strong
|
||||
- ktux: Tux-in-a-Spaceship screen saver
|
||||
- kweather: kicker applet that will display the current weather outside
|
||||
- kworldwatch: application and kicker applet showing daylight area on the
|
||||
world globe
|
||||
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post
|
||||
%update_menus
|
||||
%update_icon_cache hicolor
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun
|
||||
%clean_menus
|
||||
%clean_icon_cache hicolor
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%_kde3_bindir/amor
|
||||
%_kde3_bindir/kodo
|
||||
%_kde3_bindir/kteatime
|
||||
%_kde3_bindir/ktux
|
||||
%_kde3_bindir/kworldclock
|
||||
|
||||
%_kde3_datadir/applications/kde/amor.desktop
|
||||
%_kde3_datadir/applications/kde/kodo.desktop
|
||||
%_kde3_datadir/applications/kde/kteatime.desktop
|
||||
%_kde3_datadir/applications/kde/kworldclock.desktop
|
||||
|
||||
%_kde3_datadir/applnk/System/ScreenSavers/ktux.desktop
|
||||
%_kde3_appsdir/kdesktop/programs/kdeworld.desktop
|
||||
%_kde3_appsdir/kicker/applets/eyesapplet.desktop
|
||||
%_kde3_appsdir/kicker/applets/kfifteenapplet.desktop
|
||||
%_kde3_appsdir/kicker/applets/kmoonapplet.desktop
|
||||
%_kde3_appsdir/kicker/applets/kwwapplet.desktop
|
||||
|
||||
%_kde3_appsdir/kmoon
|
||||
%_kde3_appsdir/ktux
|
||||
%_kde3_appsdir/kteatime
|
||||
%_kde3_appsdir/kworldclock
|
||||
%_kde3_appsdir/amor
|
||||
%_kde3_appsdir/kodo
|
||||
|
||||
%_kde3_libdir/kde3/eyes_panelapplet.*
|
||||
%_kde3_libdir/kde3/fifteen_panelapplet.*
|
||||
%_kde3_libdir/kde3/kmoon_panelapplet.*
|
||||
%_kde3_libdir/kde3/ww_panelapplet.*
|
||||
|
||||
%_kde3_iconsdir/hicolor/*/apps/amor.png
|
||||
%_kde3_iconsdir/hicolor/*/apps/kmoon.png
|
||||
%_kde3_iconsdir/hicolor/*/apps/kodo.png
|
||||
%_kde3_iconsdir/hicolor/*/apps/kteatime.png
|
||||
%_kde3_iconsdir/hicolor/*/apps/kworldclock.png
|
||||
%_kde3_iconsdir/hicolor/*/apps/ktux.png
|
||||
|
||||
%doc %_kde3_docdir/HTML/en/amor
|
||||
%doc %_kde3_docdir/HTML/en/kmoon
|
||||
%doc %_kde3_docdir/HTML/en/kodo
|
||||
%doc %_kde3_docdir/HTML/en/kteatime
|
||||
%doc %_kde3_docdir/HTML/en/kworldclock
|
||||
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package -n %lib_name-devel
|
||||
Summary: Headers files for kdetoys
|
||||
Group: Development/KDE and Qt
|
||||
|
||||
Provides: kdetoys-devel = %epoch:%version-%release
|
||||
Obsoletes: kdetoys-devel
|
||||
|
||||
|
||||
Obsoletes: kdetoys3-devel
|
||||
Provides: kdetoys3-devel = %epoch:%name-%version
|
||||
Provides: %lib_name_orig-devel = %epoch:%version-%release
|
||||
Obsoletes: %lib_name_orig-devel
|
||||
Provides: %lib_oldname-devel = %epoch:%version-%release
|
||||
Obsoletes: %lib_oldname
|
||||
|
||||
Provides: %lib_name_orig-devel = %epoch:%version-%release
|
||||
|
||||
%description -n %lib_name-devel
|
||||
Headers files for kdetoys.
|
||||
|
||||
|
||||
%files -n %lib_name-devel
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_includedir/*.h
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package kweather
|
||||
Group: Graphical desktop/KDE3
|
||||
Summary: Applet displaying the current weather
|
||||
Conflicts: kdetoys < 1:3.5.8-1
|
||||
Conflicts: %lib_name-kweather <= 3.2.3-1mdk
|
||||
Provides: kweather3
|
||||
Provides: kde3-kweather
|
||||
Provides: %{oname}-kweather = %epoch:%version-%release
|
||||
Obsoletes: %{oname}-kweather
|
||||
Requires: %lib_name-kweather = %epoch:%version-%release
|
||||
|
||||
%description kweather
|
||||
kicker applet that will display the current weather outside
|
||||
|
||||
%files kweather
|
||||
%defattr(-,root,root,-)
|
||||
%doc %_kde3_docdir/HTML/en/kweather
|
||||
%_kde3_bindir/kweather*
|
||||
%_kde3_appsdir/kicker/applets/kweather.desktop
|
||||
%_kde3_appsdir/kweather*
|
||||
%_kde3_datadir/services/kcmweather.desktop
|
||||
%_kde3_datadir/services/kweatherservice.desktop
|
||||
%_kde3_datadir/services/kcmweatherservice.desktop
|
||||
%_kde3_libdir/kde3/*weather*
|
||||
%_kde3_iconsdir/hicolor/*/*/kweat*
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package -n %lib_name-kweather
|
||||
Group: Development/KDE and Qt
|
||||
Summary: Libraries for kdetoys
|
||||
Conflicts: kdetoys < 3.5.8-5
|
||||
Conflicts: %lib_name <= 3.2.3-11mdk
|
||||
Provides: %{lib_oldname}-kweather = %epoch:%version-%release
|
||||
Obsoletes: %{lib_oldname}-kweather
|
||||
|
||||
%description -n %lib_name-kweather
|
||||
kicker applet that will display the current weather outside
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n %lib_name-kweather -p /sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %lib_name-kweather -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files -n %lib_name-kweather
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_libdir/libkdeinit_kweatherreport.*
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
|
||||
%setup -q -n %{oname}-%{version}
|
||||
%patch0 -p1 -b .fix_screensaver_nodisplay
|
||||
%if %mdkversion >= 201000
|
||||
%patch1 -p1
|
||||
#%patch2 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
export QTDIR=%{qt3dir}
|
||||
|
||||
make -f admin/Makefile.common cvs
|
||||
|
||||
PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
|
||||
|
||||
%configure_kde3 \
|
||||
--with-extra-includes=/usr/include/avahi-compat-libdns_sd:/opt/kde3/include/tqt \
|
||||
--with-extra-libs=/opt/kde3/lib
|
||||
%make
|
||||
|
||||
|
||||
%install
|
||||
rm -fr %buildroot
|
||||
make install DESTDIR=%buildroot
|
||||
|
||||
%clean
|
||||
rm -fr %buildroot
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jul 18 2011 Tim Williams <tim@my-place.org.uk> 1:3.5.12-1mvt2010.2
|
||||
+ Update sources and rebuild for Trinity 3.5.12
|
||||
- remove fix-autotools.patch
|
||||
|
||||
* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 1:3.5.10-2mvt2010.1
|
||||
+ Rebuild for MDV 2010.1
|
||||
|
||||
* Tue Jan 19 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:3.5.10-2mvt2010.0
|
||||
- Rebuild for 2010.0
|
||||
- Change package name to avoid KDE4 upgrade
|
||||
+ KDE builds with autoconf 2.65, add patch for this and
|
||||
set autoconf to version 2.65:patch3
|
||||
+ Fix automake 1.11 issue:patch4
|
||||
|
||||
* Tue Oct 14 2008 Funda Wang <fundawang@mandriva.org> 1:3.5.10-1mdv2009.1
|
||||
+ Revision: 293470
|
||||
- New version 3.5.10
|
||||
- drop upstream patch
|
||||
|
||||
* Fri Aug 08 2008 Thierry Vignaud <tvignaud@mandriva.com> 1:3.5.9-4mdv2009.0
|
||||
+ Revision: 267780
|
||||
- rebuild early 2009.0 package (before pixel changes)
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
|
||||
|
||||
* Wed Jun 11 2008 Funda Wang <fundawang@mandriva.org> 1:3.5.9-3mdv2009.0
|
||||
+ Revision: 217989
|
||||
- Rebuild for new ldflags
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
|
||||
|
||||
* Wed May 07 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-2mdv2009.0
|
||||
+ Revision: 203741
|
||||
- Move to /opt
|
||||
|
||||
* Fri Feb 15 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-1mdv2008.1
|
||||
+ Revision: 169163
|
||||
- Get away from branches. Last KDE 3 arriving !!
|
||||
- Removed post-3.5.8 patches integrated
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- fix summary-not-capitalized
|
||||
- fix description-line-too-long
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- Fix Nantes location
|
||||
- [FEATURE] Add some stations on Kweather (Bug #35562)
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
* Mon Dec 31 2007 Oden Eriksson <oeriksson@mandriva.com> 1:3.5.8-8mdv2008.1
|
||||
+ Revision: 139865
|
||||
- rebuilt against openldap-2.4.7 libs
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
|
||||
* Sat Dec 08 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.8-7mdv2008.1
|
||||
+ Revision: 116559
|
||||
- Use icons macros for kweather package too
|
||||
Use rpms macros for icons
|
||||
- Clean spec file
|
||||
|
||||
* Fri Dec 07 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.8-6mdv2008.1
|
||||
+ Revision: 116129
|
||||
- Only package kweather stuffs on kweather packages
|
||||
|
||||
* Fri Dec 07 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.8-5mdv2008.1
|
||||
+ Revision: 116095
|
||||
- Fix conflicts between kdetoys and libkdetoys-kweather
|
||||
|
||||
* Mon Nov 19 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.8-4mdv2008.1
|
||||
+ Revision: 110493
|
||||
- Add conflicts to allow smooth upgrades
|
||||
- File File list ( Fix the fact that kweather do not work )
|
||||
|
||||
* Sun Oct 28 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.8-1mdv2008.1
|
||||
+ Revision: 102857
|
||||
- KDE 3.5.8
|
||||
|
||||
* Thu May 17 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-1mdv2008.0
|
||||
+ Revision: 27531
|
||||
- 3.5.7 release
|
||||
|
||||
|
||||
* Sat Mar 31 2007 Laurent Montel <lmontel@mandriva.com> 3.5.6-6mdv2007.1
|
||||
+ Revision: 149992
|
||||
- Only display it under kde
|
||||
- Fix screensaver nodisplay
|
||||
|
||||
* Tue Mar 06 2007 Laurent Montel <lmontel@mandriva.com> 1:3.5.6-4mdv2007.1
|
||||
+ Revision: 133944
|
||||
- Fix specification
|
||||
|
||||
* Mon Feb 05 2007 Laurent Montel <lmontel@mandriva.com> 1:3.5.6-3mdv2007.1
|
||||
+ Revision: 116381
|
||||
- Remove non existing requires
|
||||
- 3.5.6
|
||||
|
||||
* Fri Dec 22 2006 Laurent Montel <lmontel@mandriva.com> 1:3.5.5-2mdv2007.1
|
||||
+ Revision: 101414
|
||||
- Fix spec file
|
||||
|
||||
* Wed Oct 18 2006 Laurent Montel <lmontel@mandriva.com> 1:3.5.5-1mdv2007.1
|
||||
+ Revision: 65909
|
||||
- 3.5.5
|
||||
- New release (2006/08/03 3.5.4-1mdv)
|
||||
- Use macro
|
||||
- 3.5.3
|
||||
- Rebuild
|
||||
- Rebuild for generate category
|
||||
- 3.5.2
|
||||
- 3.5.1
|
||||
- MDK9.2 is obsolete now
|
||||
- Enable debug for cooker
|
||||
- toto
|
||||
- real kde3.5
|
||||
- 3.5.0 (named rc1)
|
||||
- 3.4.92
|
||||
- Rebuild
|
||||
- Use --libsuffix
|
||||
use %%qtdir
|
||||
- Fix error
|
||||
- Remove debug
|
||||
Add diff from svn kde 3.4.2 branch
|
||||
- 3.4.2
|
||||
|
||||
+ Andreas Hasenack <andreas@mandriva.com>
|
||||
- renamed mdv to packages because mdv is too generic and it's hosting only packages anyway
|
||||
|
||||
+ Helio Chissini de Castro <helio@mandriva.com>
|
||||
- We are Mandriva now
|
||||
- Uploading package ./kdetoys
|
||||
|
||||
* Thu May 05 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-5mdk
|
||||
- Rebuild
|
||||
|
||||
* Sat Apr 23 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-4mdk
|
||||
- Reactivate -fvisibility same as for ppc ask by Christiaan Welvaart <cjw@daneel.dyndns.org>
|
||||
|
||||
* Tue Apr 12 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-3mdk
|
||||
- Fix requires (bug found by Nicolas Chipaux)
|
||||
|
||||
* Tue Apr 12 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.4.0-2mdk
|
||||
- Use --enable-new-ldflags
|
||||
- change email
|
||||
|
||||
* Thu Apr 07 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.4.0-1mdk
|
||||
- 3.4.0
|
||||
|
||||
* Thu Feb 10 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-6mdk
|
||||
- Disable debug
|
||||
|
||||
* Fri Jan 28 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-4mdk
|
||||
- Fix generated menu
|
||||
- Don't generate menu entry for ktux screensaver use applnk default directory which is hidden by default
|
||||
|
||||
* Mon Jan 24 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-4mdk
|
||||
- Disable visibility for ppc
|
||||
|
||||
* Fri Jan 07 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-3mdk
|
||||
- Use -fvisibility
|
||||
|
||||
* Thu Dec 09 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-2mdk
|
||||
- Fix menu
|
||||
|
||||
* Tue Nov 30 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-1mdk
|
||||
- 3.3.2
|
||||
|
||||
* Thu Oct 28 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-3mdk
|
||||
- Bye-bye %%buildfor
|
||||
|
||||
* Tue Oct 12 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-2mdk
|
||||
- Deprecated mdk < 9.2
|
||||
|
||||
* Fri Oct 08 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-1mdk
|
||||
- 3.3.1
|
||||
|
||||
* Thu Sep 30 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-4mdk
|
||||
- Fix conflict
|
||||
|
||||
* Wed Sep 29 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-3mdk
|
||||
- Fix conflict from MDK10.0
|
||||
|
||||
* Wed Sep 22 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-2mdk
|
||||
- Fix conflict
|
||||
|
||||
* Sat Sep 04 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-1mdk
|
||||
- 3.3.0
|
||||
|
||||
* Tue Aug 24 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-10mdk
|
||||
- add patch2: fix kweather rtl
|
||||
|
||||
* Sat Aug 14 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-9mdk
|
||||
- Rebuild for missing package
|
||||
|
||||
* Tue Aug 10 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-8mdk
|
||||
- Remove debug
|
||||
|
||||
* Thu Aug 05 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-7mdk
|
||||
- Fix conflict
|
||||
|
||||
* Wed Aug 04 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-6mdk
|
||||
- Fix spec file
|
||||
|
||||
* Fri Jul 23 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-5mdk
|
||||
- Fix remove rpath
|
||||
|
||||
* Wed Jul 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-4mdk
|
||||
- Rebuild to new kdelibs
|
||||
|
||||
* Tue Jul 06 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-3mdk
|
||||
- Fix conflict
|
||||
- Remove libkdetoys it's empty
|
||||
|
||||
* Tue Jun 15 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-1mdk
|
||||
- 3.2.3
|
||||
|
||||
* Sat Jun 05 2004 <lmontel@n2.mandrakesoft.com> 3.2.2-4mdk
|
||||
- Rebuild
|
||||
|
||||
* Fri Jun 04 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-3mdk
|
||||
- Fix conflict
|
||||
|
||||
* Wed Jun 02 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-2mdk
|
||||
- Rebuild with debug
|
||||
|
||||
* Tue Apr 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-1mdk
|
||||
- 3.2.2
|
||||
|
||||
* Wed Apr 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.1-2mdk
|
||||
- Fix spec file for using rpmbuildupdate
|
||||
|
||||
* Sat Apr 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.1-1mdk
|
||||
- 3.2.1
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
--- kdetoys-3.5.6/ktux/ktux.desktop.fix_screensaver_nodisplay 2007-01-15 12:25:09.000000000 +0100
|
||||
+++ kdetoys-3.5.6/ktux/ktux.desktop 2007-03-30 11:47:22.000000000 +0200
|
||||
@@ -16,6 +16,8 @@
|
||||
Actions=Setup;InWindow;Root;
|
||||
X-KDE-Category=Flying Things
|
||||
Terminal=false
|
||||
+NoDisplay=true
|
||||
+OnlyShowIn=KDE
|
||||
|
||||
[Desktop Action Setup]
|
||||
Exec=ktux -setup
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,25 +0,0 @@
|
||||
From ebe3536411c8d0177030ab67578db6a406a288f4 Mon Sep 17 00:00:00 2001
|
||||
From: unknown author <cooker@mandrivalinux.org>
|
||||
Date: Thu, 23 Apr 2009 14:55:30 +0000
|
||||
Subject: [PATCH] ktimer icons
|
||||
|
||||
---
|
||||
ktimer/ktimer.desktop | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/ktimer/ktimer.desktop b/ktimer/ktimer.desktop
|
||||
index d34c43b..bda8ad0 100644
|
||||
--- a/ktimer/ktimer.desktop
|
||||
+++ b/ktimer/ktimer.desktop
|
||||
@@ -41,7 +41,7 @@ GenericName[uk]=Таймер
|
||||
GenericName[zh_CN]=倒计时
|
||||
GenericName[zh_TW]=倒數發射計時
|
||||
Exec=ktimer
|
||||
-Icon=ktimer
|
||||
+Icon=timemanagement_section.xpm
|
||||
Type=Application
|
||||
Terminal=false
|
||||
Name=KTimer
|
||||
--
|
||||
1.6.2.4
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From c2b0c2f49c20f81eeea19be1bff6143a93b68f0e Mon Sep 17 00:00:00 2001
|
||||
From: unknown author <cooker@mandrivalinux.org>
|
||||
Date: Thu, 23 Apr 2009 14:55:30 +0000
|
||||
Subject: [PATCH] fix lha support
|
||||
|
||||
---
|
||||
ark/lha.cpp | 2 ++
|
||||
1 files changed, 2 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/ark/lha.cpp b/ark/lha.cpp
|
||||
index f890139..cfc0999 100644
|
||||
--- a/ark/lha.cpp
|
||||
+++ b/ark/lha.cpp
|
||||
@@ -57,6 +57,8 @@ LhaArch::LhaArch( ArkWidget *_gui, const QString & _fileName )
|
||||
{
|
||||
m_archiver_program = "lha";
|
||||
verifyCompressUtilityIsAvailable( m_archiver_program );
|
||||
+ m_unarchiver_program = "lha";
|
||||
+ verifyUncompressUtilityIsAvailable( m_unarchiver_program );
|
||||
|
||||
m_headerString = "----";
|
||||
}
|
||||
--
|
||||
1.6.2.4
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,716 +0,0 @@
|
||||
%define oname kdewebdev
|
||||
%define lib_name_orig lib%oname
|
||||
%define lib_major 0
|
||||
%define lib_name %mklibname %name %lib_major
|
||||
%define lib_oldname %mklibname %oname %lib_major
|
||||
|
||||
%define oldname quanta
|
||||
%define oldlib_name %mklibname %oldname %lib_major
|
||||
|
||||
%define obsolete_numver 3.2.3-30mdk
|
||||
|
||||
%define unstable 0
|
||||
%{?_unstable: %{expand: %%global unstable 1}}
|
||||
|
||||
%if %unstable
|
||||
%define dont_strip 1
|
||||
%endif
|
||||
|
||||
Name: kde3-%{oname}
|
||||
Version: 3.5.12
|
||||
Release: %mkrel 1
|
||||
License: GPL
|
||||
Summary: A web editor for the KDE Desktop Environment
|
||||
Epoch: 1
|
||||
URL: http://www.kde.org
|
||||
Source: ftp://ftp.kde.org/pub/kde/stable/%version/src/%oname-%version.tar.bz2
|
||||
Source1: css.tar.bz2
|
||||
Source2: html.tar.bz2
|
||||
Source3: javascript.tar.bz2
|
||||
Source4: mysql5-quanta-doc-20051117.tar.bz2
|
||||
Source5: php.tar.bz2
|
||||
Patch0: kde-3.5.10-acinclude.patch
|
||||
#Patch1: fix_autotools.patch
|
||||
Patch2: kdebase-3.5.12-move-xdg-menu-dir.patch
|
||||
Patch3: kdebase-3.5.12-config.patch
|
||||
Group: Graphical desktop/KDE3
|
||||
BuildRoot: %_tmppath/%name-%version-%release-root
|
||||
BuildRequires: pam
|
||||
BuildRequires: diffutils
|
||||
BuildRequires: texinfo gettext
|
||||
BuildRequires: jpeg-devel
|
||||
BuildRequires: png-devel
|
||||
BuildRequires: arts-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: libxslt-devel
|
||||
BuildRequires: automake >= 1.8
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
%endif
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
BuildRequires: kdelibs-devel
|
||||
BuildRequires: freetype2
|
||||
BuildRequires: kde3-macros
|
||||
Requires: tidy
|
||||
Requires: %{name}-kommander
|
||||
Requires: %{name}-kfilereplace
|
||||
Requires(post): desktop-file-utils
|
||||
Requires(postun): desktop-file-utils
|
||||
Conflicts: quanta <= %epoch:%obsolete_numver
|
||||
Obsoletes: %oldname <= %epoch:%obsolete_numver
|
||||
Provides: %oldname = %epoch:%version-%release
|
||||
Provides: %oldname = %epoch:%version-%release
|
||||
Obsoletes: %oname
|
||||
Conflicts: kdewebdev-kommander <= 3.5.5
|
||||
|
||||
%description
|
||||
A html editor for the K Desktop Environment.
|
||||
|
||||
%post
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%update_menus
|
||||
%{update_desktop_database}
|
||||
%update_icon_cache crystalsvg
|
||||
%update_icon_cache hicolor
|
||||
%endif
|
||||
|
||||
%postun
|
||||
%if %mdkversion < 200900
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%clean_menus
|
||||
%{clean_desktop_database}
|
||||
%clean_icon_cache crystalsvg
|
||||
%clean_icon_cache hicolor
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%_kde3_bindir/quanta
|
||||
%_kde3_bindir/kxsldbg
|
||||
%_kde3_bindir/kimagemapeditor
|
||||
%_kde3_bindir/klinkstatus
|
||||
%doc %_kde3_docdir/HTML/en/xsldbg
|
||||
%dir %_kde3_datadir/apps/quanta
|
||||
%_kde3_datadir/apps/quanta/*
|
||||
%dir %_kde3_datadir/apps/kimagemapeditor/
|
||||
%_kde3_datadir/apps/kimagemapeditor/*
|
||||
%_kde3_iconsdir/*/*/*/kimagemap*
|
||||
%_kde3_datadir/services/kimagemapeditorpart.desktop
|
||||
%_kde3_libdir/kde3/libkimagemapeditor.*
|
||||
%_kde3_datadir/applications/kde/kimagemapeditor.desktop
|
||||
%_kde3_datadir/applications/kde/klinkstatus.desktop
|
||||
%_kde3_datadir/applications/kde/kxsldbg.desktop
|
||||
%_kde3_datadir/applications/kde/quanta.desktop
|
||||
%_kde3_datadir/services/klinkstatus_part.desktop
|
||||
%dir %_kde3_datadir/apps/klinkstatus
|
||||
%_kde3_datadir/apps/klinkstatus/*
|
||||
%dir %_kde3_datadir/apps/klinkstatuspart/
|
||||
%_kde3_datadir/apps/klinkstatuspart/*.rc
|
||||
%dir %_kde3_datadir/apps/klinkstatuspart/pics/
|
||||
%_kde3_datadir/apps/klinkstatuspart/pics/*.png
|
||||
%_kde3_datadir/config.kcfg/klinkstatus.kcfg
|
||||
%doc %_kde3_docdir/HTML/en/klinkstatus
|
||||
%_kde3_libdir/kde3/libklinkstatuspart.*
|
||||
%_kde3_iconsdir/*/*/*/klinkstat*
|
||||
%_kde3_iconsdir/*/*/actions/*
|
||||
%_kde3_iconsdir/*/*/*/quanta*
|
||||
%_kde3_datadir/mimelnk/application/x-webprj.desktop
|
||||
%_kde3_datadir/servicetypes/quantadebugger.desktop
|
||||
%dir %_kde3_datadir/apps/kxsldbg/
|
||||
%_kde3_datadir/apps/kxsldbg/*
|
||||
%dir %_kde3_datadir/apps/kxsldbgpart/
|
||||
%_kde3_datadir/apps/kxsldbgpart/*
|
||||
%dir %_kde3_datadir/apps/kafkapart/
|
||||
%_kde3_datadir/apps/kafkapart/*
|
||||
%_kde3_libdir/kde3/libkxsldbgpart.*
|
||||
%_kde3_libdir/kde3/quantadebugger*.*
|
||||
%_kde3_datadir/services/kxsldbg_part.desktop
|
||||
%_kde3_datadir/services/quanta_preview_config.desktop
|
||||
%_kde3_datadir/services/quantadebuggerdbgp.desktop
|
||||
%_kde3_datadir/services/quantadebuggergubed.desktop
|
||||
%doc %_kde3_docdir/HTML/en/quanta
|
||||
%doc %_kde3_docdir/HTML/en/kxsldbg
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
|
||||
%package quanta-doc
|
||||
Summary: Documentation about Quanta
|
||||
Group: Books/Computer books
|
||||
Provides: kde3-quanta-doc = %epoch:%version-%release
|
||||
Provides: %oname-quanta-doc = %epoch:%version-%release
|
||||
Obsoletes: %oname-quanta-doc
|
||||
|
||||
%description quanta-doc
|
||||
Documentation for Quanta
|
||||
|
||||
%files quanta-doc
|
||||
%dir %_kde3_docdir/quanta
|
||||
%dir %_kde3_docdir/quanta/css
|
||||
%doc %_kde3_docdir/quanta/css/*
|
||||
%dir %_kde3_docdir/quanta/html
|
||||
%doc %_kde3_docdir/quanta/html/*
|
||||
%dir %_kde3_docdir/quanta/javascript
|
||||
%doc %_kde3_docdir/quanta/javascript/*
|
||||
%dir %_kde3_docdir/quanta/mysql5
|
||||
%doc %_kde3_docdir/quanta/mysql5/*
|
||||
%dir %_kde3_docdir/quanta/php
|
||||
%doc %_kde3_docdir/quanta/php/*
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
|
||||
%package kfilereplace
|
||||
Summary: Kfilereplace
|
||||
Group: Graphical desktop/KDE3
|
||||
Obsoletes: kfilereplace <= 0.7.1-1mdk
|
||||
Provides: kde3-kfilereplace = %epoch:%version-%release
|
||||
Conflicts: quanta <= %epoch:%obsolete_numver
|
||||
Obsoletes: %oldname-kfilereplace <= %epoch:%obsolete_numver
|
||||
Provides: %oldname-kfilereplace = %epoch:%version-%release
|
||||
Obsoletes: %lib_name-kfilereplace < 1:3.5.9
|
||||
Provides: %oname-kfilereplace = %epoch:%version-%release
|
||||
Obsoletes: %oname-kfilereplace
|
||||
|
||||
%description kfilereplace
|
||||
Kfilereplace program
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post kfilereplace
|
||||
%update_menus
|
||||
%{update_desktop_database}
|
||||
%update_icon_cache crystalsvg
|
||||
%update_icon_cache hicolor
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun kfilereplace
|
||||
%clean_menus
|
||||
%{clean_desktop_database}
|
||||
%clean_icon_cache crystalsvg
|
||||
%clean_icon_cache hicolor
|
||||
%endif
|
||||
|
||||
%files kfilereplace
|
||||
%defattr(-,root,root)
|
||||
%_kde3_bindir/kfilereplace
|
||||
%dir %_kde3_datadir/apps/kfilereplacepart
|
||||
%_kde3_datadir/apps/kfilereplacepart/*
|
||||
%dir %_kde3_datadir/apps/kfilereplace/
|
||||
%_kde3_datadir/apps/kfilereplace/*
|
||||
%_kde3_datadir/services/kfilereplacepart.desktop
|
||||
%doc %_kde3_docdir/HTML/en/kfilereplace
|
||||
%_kde3_datadir/applications/kde/kfilereplace.desktop
|
||||
%_kde3_libdir/kde3/libkfilereplacepart.*
|
||||
%_kde3_iconsdir/*/*/*/kfilerep*
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
|
||||
%package kommander
|
||||
Summary: Kommander
|
||||
Group: Graphical desktop/KDE3
|
||||
Provides: kde3-kommander = %epoch:%version-%release
|
||||
Requires: %lib_name-kommander = %epoch:%version-%release
|
||||
Conflicts: quanta <= %epoch:%obsolete_numver
|
||||
Conflicts: %name < 3.5.4-4
|
||||
Obsoletes: %oldname-kommander <= %epoch:%obsolete_numver
|
||||
Provides: %oldname-kommander = %epoch:%version-%release
|
||||
Provides: %oname-kommander = %epoch:%version-%release
|
||||
Obsoletes: %oname-kommander
|
||||
Requires(post): desktop-file-utils
|
||||
Requires(postun): desktop-file-utils
|
||||
|
||||
%description kommander
|
||||
Kommander program
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post kommander
|
||||
%update_menus
|
||||
%{update_desktop_database}
|
||||
%update_icon_cache crystalsvg
|
||||
%update_icon_cache hicolor
|
||||
%endif
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%postun kommander
|
||||
%clean_menus
|
||||
%{clean_desktop_database}
|
||||
%clean_icon_cache crystalsvg
|
||||
%clean_icon_cache hicolor
|
||||
%endif
|
||||
|
||||
%files kommander
|
||||
%defattr(-,root,root)
|
||||
%_kde3_bindir/kmdr-executor
|
||||
%_kde3_bindir/kmdr-plugins
|
||||
%_kde3_bindir/kmdr-editor
|
||||
%_kde3_bindir/xsldbg
|
||||
%_kde3_bindir/extractkmdr
|
||||
%_kde3_bindir/kmdr2po
|
||||
%_kde3_datadir/mimelnk/application/x-kommander.desktop
|
||||
%doc %_kde3_docdir/HTML/en/kommander
|
||||
%_kde3_datadir/applnk/.hidden/kmdr-executor.desktop
|
||||
%_kde3_datadir/applications/kde/kmdr-editor.desktop
|
||||
%_kde3_iconsdir/*/*/*/kommand*
|
||||
%_kde3_datadir/apps/kommander
|
||||
%_kde3_datadir/apps/kmdr-editor
|
||||
%_kde3_datadir/apps/katepart/syntax/kommand*
|
||||
%_kde3_datadir/apps/kdevappwizard/templates/kommander*
|
||||
%_kde3_datadir/apps/kdevappwizard/kommander*
|
||||
%_kde3_datadir/services/kommander_part.desktop
|
||||
%_kde3_libdir/kde3/libkommander_part.*
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
|
||||
%package -n %lib_name-kommander
|
||||
Summary: Library for Kommander
|
||||
Group: System/Libraries
|
||||
Conflicts: quanta <= %epoch:%obsolete_numver
|
||||
Provides: %oldlib_name-kommander = %epoch:%version-%release
|
||||
Provides: %lib_oldname-kommander = %epoch:%version-%release
|
||||
Obsoletes: %lib_oldname-kommander
|
||||
Obsoletes: %oldlib_name-kommander
|
||||
Conflicts: quanta <= 3.2-9mdk
|
||||
|
||||
%description -n %lib_name-kommander
|
||||
Kommander program
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post -n %lib_name-kommander -p /sbin/ldconfig
|
||||
%endif
|
||||
%if %mdkversion < 200900
|
||||
%postun -n %lib_name-kommander -p /sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files -n %lib_name-kommander
|
||||
%defattr(-,root,root)
|
||||
%_kde3_libdir/libkommanderwidgets.la
|
||||
%_kde3_libdir/libkommanderwidgets.so.*
|
||||
%_kde3_libdir/libkommanderplugin.la
|
||||
%_kde3_libdir/libkommanderplugin.so.*
|
||||
%_kde3_libdir/libkommanderwidget.la
|
||||
%_kde3_libdir/libkommanderwidget.so.*
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
|
||||
%package -n %lib_name
|
||||
Summary: Library for kdewebdev
|
||||
Group: System/Libraries
|
||||
Provides: %lib_name_orig = %epoch:%version-%release
|
||||
Provides: quanta-devel = %epoch:%version-%release
|
||||
Conflicts: quanta <= %epoch:%obsolete_numver
|
||||
Obsoletes: %oldlib_name <= %epoch:%obsolete_numver
|
||||
Provides: %oldlib_name = %epoch:%version-%release
|
||||
Provides: %lib_oldname = %epoch:%version-%release
|
||||
Obsoletes: %lib_oldname
|
||||
|
||||
|
||||
%description -n %lib_name
|
||||
Library files for kdewebdev.
|
||||
|
||||
%files -n %lib_name
|
||||
%defattr(-,root,root)
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
|
||||
%package devel
|
||||
Summary: Development library for kdewebdev
|
||||
Group: Development/KDE and Qt
|
||||
Requires: %lib_name-kommander = %epoch:%version
|
||||
Requires: %lib_name = %epoch:%version
|
||||
Obsoletes: %oldlib_name-devel <= %epoch:%obsolete_numver
|
||||
Provides: %oldlib_name-devel = %epoch:%version-%release
|
||||
Obsoletes: %lib_name-devel < 1:3.5.9
|
||||
Provides: %lib_name-devel = %epoch:%version-%release
|
||||
Obsoletes: quanta-devel < 1:3.5.9
|
||||
Provides: kde3-quanta-devel = %epoch:%version-%release
|
||||
Provides: %{lib_name_orig}-devel = %epoch:%version-%release
|
||||
Conflicts: quanta <= %epoch:%obsolete_numver
|
||||
Obsoletes: %lib_name-kommander-devel < 1:3.5.9
|
||||
Provides: %lib_name-kommander-devel = %epoch:%version
|
||||
Provides: %lib_oldname-devel = %epoch:%version-%release
|
||||
Obsoletes: %lib_oldname-devel
|
||||
|
||||
%description devel
|
||||
Development library files for quanta.
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%_kde3_includedir/*.h
|
||||
%_kde3_libdir/libkommanderwidgets.so
|
||||
%_kde3_libdir/libkommanderplugin.so
|
||||
%_kde3_libdir/libkommanderwidget.so
|
||||
|
||||
#--------------------------------------------------------------------------
|
||||
|
||||
%prep
|
||||
|
||||
%setup -q -n %oname-%version -a 1 -a 2 -a 3 -a 4 -a 5
|
||||
%if %mdkversion >= 201000
|
||||
%patch0 -p1
|
||||
#%patch1 -p1
|
||||
%endif
|
||||
%patch2 -p0
|
||||
%patch3 -p0
|
||||
|
||||
%build
|
||||
export QTDIR=%qt3dir
|
||||
PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH;
|
||||
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/
|
||||
export xdg_menudir=%_sysconfdir/xdg/kde/menus
|
||||
|
||||
make -f admin/Makefile.common cvs
|
||||
|
||||
%configure_kde3
|
||||
|
||||
%make
|
||||
|
||||
%install
|
||||
rm -fr %buildroot
|
||||
|
||||
make install DESTDIR=%buildroot
|
||||
|
||||
cp kommander/working/extractkmdr %buildroot/%_kde3_bindir/
|
||||
cp kommander/working/kmdr2po %buildroot/%_kde3_bindir/
|
||||
|
||||
%__mkdir -p %buildroot%_kde3_datadir/doc/quanta
|
||||
cp -r css/ %buildroot%_kde3_datadir/doc/quanta
|
||||
cp -r html/ %buildroot%_kde3_datadir/doc/quanta
|
||||
cp -r javascript/ %buildroot%_kde3_datadir/doc/quanta
|
||||
cp -r mysql5/ %buildroot%_kde3_datadir/doc/quanta
|
||||
cp -r php/ %buildroot%_kde3_datadir/doc/quanta
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
|
||||
* Mon Jul 25 2011 Tim Williams <tim@my-place.org.uk> 1:3.5.12-1mvt2010.2
|
||||
- Remove fix_autotools.patch
|
||||
+ Add kdebase-3.5.12-move-xdg-menu-dir.patch, kdebase-3.5.12-config.patch
|
||||
|
||||
* Mon Jul 19 2010 Tim Williams <tim@my-place.org.uk> 1:3.5.10-3mvt2010.0
|
||||
- Rebuild for MDV 2010.1
|
||||
|
||||
* Mon Jan 18 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1:3.5.10-2mvt2010.0
|
||||
- Rebuild for 2010.0
|
||||
- Change package name to avoid KDE4 upgrade
|
||||
+ KDE builds with autoconf 2.65, add patch for this and
|
||||
set autoconf to version 2.65:patch0
|
||||
+ Fix automake 1.11 issue:patch1
|
||||
|
||||
* Mon Nov 16 2009 Tim Williams <tim@my-place.org.uk> 1:3.5.10-1mdv2010.0
|
||||
+ rebuild for MDV 2010.0
|
||||
|
||||
* Sun Apr 19 2009 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.10-1mdv2009.1
|
||||
+ Revision: 368024
|
||||
- New version 3.5.10
|
||||
|
||||
* Fri Aug 08 2008 Thierry Vignaud <tvignaud@mandriva.com> 1:3.5.9-6mdv2009.0
|
||||
+ Revision: 267782
|
||||
- rebuild early 2009.0 package (before pixel changes)
|
||||
|
||||
* Fri Jun 13 2008 Funda Wang <fundawang@mandriva.org> 1:3.5.9-5mdv2009.0
|
||||
+ Revision: 218660
|
||||
- rebuild for new ldflags
|
||||
|
||||
+ Pixel <pixel@mandriva.com>
|
||||
- rpm filetriggers deprecates update_menus/update_scrollkeeper/update_mime_database/update_icon_cache/update_desktop_database/post_install_gconf_schemas
|
||||
- do not call ldconfig in %%post/%%postun, it is now handled by filetriggers
|
||||
|
||||
* Tue May 20 2008 Rodrigo Gonçalves de Oliveira <rodrigo@mandriva.com> 1:3.5.9-4mdv2009.0
|
||||
+ Revision: 209431
|
||||
- Use versioned obsoletes
|
||||
|
||||
* Thu May 08 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.9-3mdv2009.0
|
||||
+ Revision: 204587
|
||||
- Fix Build ( thanks to helio)
|
||||
- Move to /opt/kde3
|
||||
|
||||
* Sat Mar 22 2008 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.9-2mdv2008.1
|
||||
+ Revision: 189497
|
||||
- Fix groups ( tks to pterjan)
|
||||
|
||||
* Fri Feb 15 2008 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.9-1mdv2008.1
|
||||
+ Revision: 169024
|
||||
- Get away from branches. Last KDE 3 arriving !!
|
||||
- Removed post-3.5.8 patches integrated
|
||||
- Obsolete worng lib devel packages to one devel package to rule then all
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- fix spacing at top of description
|
||||
|
||||
* Sun Dec 30 2007 Funda Wang <fundawang@mandriva.org> 1:3.5.8-3mdv2008.1
|
||||
+ Revision: 139415
|
||||
- rebuild
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
|
||||
* Fri Nov 02 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.8-1mdv2008.1
|
||||
+ Revision: 105097
|
||||
- Kde 3.5.8
|
||||
|
||||
* Thu Oct 04 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.7-3mdv2008.0
|
||||
+ Revision: 95305
|
||||
- Fix upgrade from 2007.0
|
||||
|
||||
+ Anssi Hannula <anssi@mandriva.org>
|
||||
- remove hardcoded packager tag
|
||||
|
||||
* Sat Jun 23 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1:3.5.7-2mdv2008.0
|
||||
+ Revision: 43460
|
||||
- [FEATURE] Add documentation for Quanta (bug #10091)'
|
||||
|
||||
* Thu May 17 2007 Helio Chissini de Castro <helio@mandriva.com> 1:3.5.7-1mdv2008.0
|
||||
+ Revision: 27534
|
||||
- 3.5.7 release
|
||||
|
||||
+ Laurent Montel <lmontel@mandriva.org>
|
||||
- Fix conflict
|
||||
|
||||
|
||||
* Thu Feb 01 2007 Laurent Montel <lmontel@mandriva.com> 3.5.6-1mdv2007.0
|
||||
+ Revision: 115858
|
||||
- 3.5.6
|
||||
|
||||
* Wed Oct 18 2006 Laurent Montel <lmontel@mandriva.com> 1:3.5.5-2mdv2007.0
|
||||
+ Revision: 65944
|
||||
- Use packager tag
|
||||
- Use official tarball
|
||||
|
||||
+ Helio Chissini de Castro <helio@mandriva.com>
|
||||
- Back to use branch tarballs. Now using post 3.5.5
|
||||
- Updated spec. The spec layout was too old and not match with current kde specs
|
||||
on mandriva
|
||||
|
||||
* Sun Sep 03 2006 Laurent Montel <lmontel@mandriva.com> 1:3.5.4-4mdv2007.0
|
||||
+ Revision: 59594
|
||||
- New package (3.5.4-4mdv 2006-09-02)
|
||||
Fix crash into css editor
|
||||
|
||||
* Tue Aug 15 2006 Laurent Montel <lmontel@mandriva.com> 1:3.5.4-3mdv2007.0
|
||||
+ Revision: 55872
|
||||
- New package (2006/08/14 3.5.4-3mdv)
|
||||
Be sure to obsolete old package (migrate pb)
|
||||
|
||||
* Sat Aug 12 2006 Laurent Montel <lmontel@mandriva.com> 1:3.5.4-2mdv2007.0
|
||||
+ Revision: 55626
|
||||
- New package (2006/08/11 3.5.4-2mdv)
|
||||
Fix icon into menu
|
||||
- New package (2006/08/04 3.5.4-1mdv)
|
||||
|
||||
* Wed Jul 19 2006 Laurent Montel <lmontel@mandriva.com> 1:3.5.3-3mdv2007.0
|
||||
+ Revision: 41548
|
||||
- Fix install files
|
||||
- fix compile under x86_64
|
||||
- 3.5.3
|
||||
- Rebuild to generate category
|
||||
- Fix file list
|
||||
- 3.5.2
|
||||
- 3.5.1
|
||||
- Activate debug for cooker only
|
||||
MDK9.2 is obsolete now
|
||||
- Fix kfilereplace.desktop pos
|
||||
- Real kde3.5.0
|
||||
- 3.5.0
|
||||
- Fix typo
|
||||
* Wed Nov 02 2005 Laurent MONTEL <lmontel@mandriva.com> 3.3.5-3mdk
|
||||
- Rebuild with new mysql
|
||||
* Thu Oct 27 2005 Helio Chissini de Castro <helio@mandriva.com> 3.3.5-2mdk
|
||||
- New immodule patch
|
||||
- 3.4.92
|
||||
- Rebuild
|
||||
- Requires tidy not all component otherwise it's not necessary to split it
|
||||
- New sync
|
||||
- Fix icons into kommander
|
||||
- Remove debug
|
||||
Sync with kde 3.4.2 branch
|
||||
- Oops
|
||||
- Add missing patch
|
||||
- 3.4.2
|
||||
|
||||
+ Andreas Hasenack <andreas@mandriva.com>
|
||||
- renamed mdv to packages because mdv is too generic and it's hosting only packages anyway
|
||||
|
||||
+ Helio Chissini de Castro <helio@mandriva.com>
|
||||
- Uploading package ./kdewebdev
|
||||
|
||||
* Thu May 05 2005 Laurent MONTEL <lmontel@mandriva.com> 3.4.0-3mdk
|
||||
- Rebuild
|
||||
|
||||
* Tue Apr 12 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.4.0-2mdk
|
||||
- Fix spec
|
||||
- Reenable debug
|
||||
- Use --enable-new-ldflags
|
||||
- Recreate menu entry
|
||||
|
||||
* Tue Apr 05 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.4.0-1mdk
|
||||
- 3.4.0
|
||||
|
||||
* Wed Mar 30 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-11mdk
|
||||
- Try to fix install
|
||||
|
||||
* Fri Mar 25 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-10mdk
|
||||
- Fix update from 10.1
|
||||
|
||||
* Wed Feb 23 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-9mdk
|
||||
- Fix MDK bug #13914
|
||||
|
||||
* Thu Feb 10 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-8mdk
|
||||
- Disable debug
|
||||
|
||||
* Sat Jan 29 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-7mdk
|
||||
- Fix generate menu
|
||||
|
||||
* Tue Jan 18 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-6mdk
|
||||
- Fix menu entry
|
||||
|
||||
* Sat Jan 15 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-5mdk
|
||||
- Rebuild
|
||||
|
||||
* Fri Dec 10 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-4mdk
|
||||
- Fix menu
|
||||
|
||||
* Thu Dec 09 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-3mdk
|
||||
- Remove direct requires on kommander
|
||||
|
||||
* Wed Dec 08 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-2mdk
|
||||
- Fix menu
|
||||
|
||||
* Tue Nov 30 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.2-1mdk
|
||||
- 3.3.2
|
||||
|
||||
* Thu Nov 25 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-6mdk
|
||||
- Generate menu
|
||||
|
||||
* Tue Nov 23 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-5mdk
|
||||
- Sync with CVS
|
||||
|
||||
* Wed Nov 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-4mdk
|
||||
- Fix spec
|
||||
|
||||
* Thu Oct 28 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-3mdk
|
||||
- bye-bye %%buildfor
|
||||
|
||||
* Wed Oct 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-3mdk
|
||||
- Sync with CVS
|
||||
|
||||
* Tue Oct 12 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-2mdk
|
||||
- Deprecated mdk < 9.2
|
||||
|
||||
* Sat Oct 09 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.1-1mdk
|
||||
- 3.3.1
|
||||
|
||||
* Wed Sep 29 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-4mdk
|
||||
- Fix conflict from MDK 10.0
|
||||
|
||||
* Thu Sep 23 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-3mdk
|
||||
- Update from kde3.3.0
|
||||
|
||||
* Fri Sep 17 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-2mdk
|
||||
- Rebuild without debug
|
||||
|
||||
* Fri Sep 17 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-2mdk
|
||||
- Fix conflict
|
||||
|
||||
* Sat Sep 04 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3.0-1mdk
|
||||
- kde 3.3.0
|
||||
|
||||
* Mon Aug 09 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.3-0.rc1.1mdk
|
||||
- 3.3 rc1
|
||||
|
||||
* Fri Jul 30 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.92-1mdk
|
||||
- Rename quanta to kdewebdev
|
||||
- TODO fix conflict/Obsoletes
|
||||
|
||||
* Thu Jul 29 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-6mdk
|
||||
- Add patch2: fix kde bug #82984: "grey==gray"
|
||||
|
||||
* Tue Jul 27 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-5mdk
|
||||
- Sync with CVS
|
||||
|
||||
* Thu Jul 22 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-4mdk
|
||||
- Fix remove rpath
|
||||
|
||||
* Wed Jul 14 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-3mdk
|
||||
- Sync with CVS
|
||||
|
||||
* Wed Jul 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-2mdk
|
||||
- Rebuild with new kdelibs
|
||||
|
||||
* Tue Jun 15 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.3-1mdk
|
||||
- 3.2.3
|
||||
|
||||
* Sat Jun 05 2004 <lmontel@mandrakesoft.com> 3.2.2-3mdk
|
||||
- Rebuild
|
||||
|
||||
* Wed Jun 02 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-2mdk
|
||||
- Rebuild with debug
|
||||
|
||||
* Tue Apr 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.2-1mdk
|
||||
- 3.2.2
|
||||
|
||||
* Thu Apr 15 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.1-5mdk
|
||||
- Add patch from gbeauchesne@mandrakesoft.com fix amd64 build (thanks a lot)
|
||||
|
||||
* Wed Apr 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.1-3mdk
|
||||
- Fix spec file to using rpmbuildupdate
|
||||
|
||||
* Wed Apr 07 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.1-2mdk
|
||||
- Fix requires
|
||||
|
||||
* Sat Apr 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2.1-1mdk
|
||||
- 3.2.1
|
||||
|
||||
* Wed Mar 31 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-10mdk
|
||||
- Use %%configure
|
||||
- Use mdkversion
|
||||
- Add requires on quanta-kommander
|
||||
|
||||
* Thu Mar 04 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-9mdk
|
||||
- Fix group
|
||||
- Add patch1: fix treeview crash
|
||||
- Add patch2: "Make removal of new top folders pointing to the non-local root directory (e.g ftp://someserver/) possible [#76573]."
|
||||
- Add patch3: "Fix opening of documentation pages with references [#70345]"
|
||||
- Add patch4: fix quanta crash with bookmark
|
||||
|
||||
* Fri Feb 27 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-8mdk
|
||||
- Sync
|
||||
|
||||
* Thu Feb 26 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-7mdk
|
||||
- Fix some bugs into quanta
|
||||
|
||||
* Fri Feb 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-6mdk
|
||||
- Fix menu entry
|
||||
|
||||
* Fri Feb 20 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-5mdk
|
||||
- Fix epoch
|
||||
|
||||
* Mon Feb 16 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-4mdk
|
||||
- Sync with CVS
|
||||
- Fix distlint
|
||||
- Fix buildrequires kdelibs >=3.2-13mdk (pb kdedesktop2mdkmenu)
|
||||
|
||||
* Thu Feb 12 2004 David Baudens <baudens@mandrakesoft.com> 3.2-3mdk
|
||||
- Fix menu
|
||||
|
||||
* Fri Feb 06 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-2mdk
|
||||
- Sync with CVS
|
||||
- Fix menu entry (icons/position)
|
||||
|
||||
* Tue Feb 03 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-1mdk
|
||||
- 3.2
|
||||
|
||||
* Mon Feb 02 2004 Laurent MONTEL <lmontel@mandrakesoft.com> 3.2-0.2mdk
|
||||
- Sync with CVS
|
||||
|
||||
Binary file not shown.
Binary file not shown.
@ -1,66 +0,0 @@
|
||||
2009-12-10 Stepan Kasal <skasal@redhat.com>
|
||||
|
||||
The change of implementation of AC_REQUIRE in 2.64 caused a regression
|
||||
in the arts project.
|
||||
This can be fixed by shuffling some macro calls.
|
||||
|
||||
I suppose that most of this patch will not be needed with a future
|
||||
release of Autoconf.
|
||||
But the last chunk of this patch is a real bug in this source and
|
||||
should go upstream.
|
||||
|
||||
--- arts-1.5.10/admin/acinclude.m4.in 2008-08-20 18:07:05.000000000 +0200
|
||||
+++ arts-1.5.10/admin/acinclude.m4.in 2009-12-09 17:30:57.000000000 +0100
|
||||
@@ -3081,8 +3081,18 @@
|
||||
fi
|
||||
])
|
||||
|
||||
+AC_DEFUN([AC_CHECK_COMPILERS_CC],
|
||||
+[
|
||||
+ dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
|
||||
+ CFLAGS=" $CFLAGS"
|
||||
+ AC_PROG_CC
|
||||
+ CXXFLAGS=" $CXXFLAGS"
|
||||
+ AC_PROG_CXX
|
||||
+])
|
||||
+
|
||||
AC_DEFUN([AC_CHECK_COMPILERS],
|
||||
[
|
||||
+ AC_REQUIRE([AC_CHECK_COMPILERS_CC])
|
||||
AC_ARG_ENABLE(debug,
|
||||
AC_HELP_STRING([--enable-debug=ARG],[enables debug symbols (yes|no|full) [default=no]]),
|
||||
[
|
||||
@@ -3141,11 +3151,6 @@
|
||||
[kde_use_profiling="no"]
|
||||
)
|
||||
|
||||
- dnl this prevents stupid AC_PROG_CC to add "-g" to the default CFLAGS
|
||||
- CFLAGS=" $CFLAGS"
|
||||
-
|
||||
- AC_PROG_CC
|
||||
-
|
||||
AC_PROG_CPP
|
||||
|
||||
if test "$GCC" = "yes"; then
|
||||
@@ -3174,10 +3179,6 @@
|
||||
LDFLAGS=""
|
||||
fi
|
||||
|
||||
- CXXFLAGS=" $CXXFLAGS"
|
||||
-
|
||||
- AC_PROG_CXX
|
||||
-
|
||||
KDE_CHECK_FOR_BAD_COMPILER
|
||||
|
||||
if test "$GXX" = "yes" || test "$CXX" = "KCC"; then
|
||||
@@ -3503,8 +3504,8 @@
|
||||
AC_REQUIRE([AC_LIBTOOL_DLOPEN])
|
||||
AC_REQUIRE([KDE_CHECK_LIB64])
|
||||
|
||||
-AC_OBJEXT
|
||||
-AC_EXEEXT
|
||||
+AC_REQUIRE([AC_OBJEXT])
|
||||
+AC_REQUIRE([AC_EXEEXT])
|
||||
|
||||
AM_PROG_LIBTOOL
|
||||
AC_LIBTOOL_CXX
|
||||
@ -1,174 +0,0 @@
|
||||
%define __libtoolize /bin/true
|
||||
%define oname kdmtheme
|
||||
%define name kde3-%{oname}
|
||||
|
||||
Name: %{name}
|
||||
Summary: Kdmtheme allow to change kdm theme
|
||||
Version: 1.2.2
|
||||
Release: %mkrel 4
|
||||
Source: http://beta.smileaf.org/files/kdmtheme/%{oname}-%{version}.tar.bz2
|
||||
URL: http://smileaf.org/
|
||||
Group: Graphical desktop/KDE3
|
||||
BuildRoot: %_tmppath/%oname-buildroot
|
||||
License: GPLv2+
|
||||
BuildRequires: kde3-macros
|
||||
BuildRequires: kdelibs-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
Requires: kdebase-session-plugins
|
||||
Patch0: kdmtheme-0.8.2-use-kdesu.patch
|
||||
Patch1: kde-3.5.10-acinclude.patch
|
||||
Patch2: kdmtheme-1.2.2-new-autotools.patch
|
||||
|
||||
%description
|
||||
Kdmtheme allow to change theme in kdm when we used gdm theme
|
||||
|
||||
%prep
|
||||
%setup -q -n %{oname}-%{version}
|
||||
%patch0 -p1 -b .fix_use_kdmtheme
|
||||
%patch1 -p1
|
||||
%patch2 -p1 -b .autotools
|
||||
|
||||
%build
|
||||
make -f Makefile.cvs
|
||||
%configure_kde3
|
||||
|
||||
%make
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
%makeinstall_std
|
||||
|
||||
desktop-file-install --vendor='' \
|
||||
--dir %buildroot%_kde3_datadir/applications/kde/ \
|
||||
--remove-key='Encoding' \
|
||||
--add-category='DesktopSettings;Settings' \
|
||||
%buildroot%_kde3_datadir/applications/kde/*.desktop
|
||||
|
||||
%find_lang %oname --with-html
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%if %mdkversion < 200900
|
||||
%post
|
||||
%{update_menus}
|
||||
|
||||
%postun
|
||||
%{clean_menus}
|
||||
%endif
|
||||
|
||||
%files -f %oname.lang
|
||||
%defattr(-,root,root,0755)
|
||||
%_kde3_libdir/kde3/kcm_kdmtheme.la
|
||||
%_kde3_libdir/kde3/kcm_kdmtheme.so
|
||||
%_kde3_datadir/applications/kde/*
|
||||
|
||||
|
||||
%changelog
|
||||
* Wed Jul 18 2011 Tim Williams <tim@my-place.org.uk> 1.2.2-3mvt2010.2
|
||||
+ Rebuild for Trinity
|
||||
|
||||
* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 1.2.2-3mvt2010.0
|
||||
+ Repackage for MDV 2010.1
|
||||
|
||||
* Tue Feb 09 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1.2.2-2mvt2010.0
|
||||
- Fix built with autoconf 2.65 and automake 1.11
|
||||
- Fix SPEC according to filetriggers policy
|
||||
- Change package group
|
||||
|
||||
* Fri Nov 20 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1.2.2-1mvt2010.0
|
||||
+ Rebuild for 2010.0
|
||||
|
||||
* Fri Feb 08 2008 Funda Wang <fundawang@mandriva.org> 1.2.2-1mdv2008.1
|
||||
+ Revision: 163969
|
||||
- add more categories for desktop entry
|
||||
- New version 1.2.
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- rebuild
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
- buildrequires X11-devel instead of XFree86-devel
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
* Mon May 07 2007 Laurent Montel <lmontel@mandriva.org> 1.1.3-1mdv2008.0
|
||||
+ Revision: 23970
|
||||
- 1.1.3
|
||||
|
||||
|
||||
* Wed Jan 17 2007 Laurent Montel <lmontel@mandriva.com> 1.1.2-2mdv2007.0
|
||||
+ Revision: 109749
|
||||
- Fix autoconf detect
|
||||
- Fix requires
|
||||
- Import kdmtheme
|
||||
|
||||
* Sat Jun 24 2006 Laurent MONTEL <lmontel@mandriva.com> 1.1.2-1mdk
|
||||
- 1.1.2
|
||||
|
||||
* Tue May 09 2006 Laurent MONTEL <lmontel@mandriva.com> 1.1-2mdk
|
||||
- Rebuild to generate category
|
||||
|
||||
* Fri Mar 24 2006 Laurent MONTEL <lmontel@mandriva.com> 1.1-1mdk
|
||||
- 1.1
|
||||
|
||||
* Tue Jan 31 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0.1-1mdk
|
||||
- 1.0.1
|
||||
|
||||
* Fri Dec 30 2005 Laurent MONTEL <lmontel@mandriva.com> 0.9.2-1mdk
|
||||
- 0.9.2
|
||||
|
||||
* Thu Jul 21 2005 Laurent MONTEL <lmontel@mandriva.com> 0.9.1-1mdk
|
||||
- 0.9.1
|
||||
|
||||
* Sat Jul 09 2005 Laurent MONTEL <lmontel@mandriva.com> 0.9-4mdk
|
||||
- Rebuild
|
||||
|
||||
* Fri Apr 08 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 0.9-3mdk
|
||||
- Fix compile on x86_64 (copy/paste is bad !!!)
|
||||
|
||||
* Thu Apr 07 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 0.9-2mdk
|
||||
- Add patch2: fix disable widget
|
||||
|
||||
* Thu Apr 07 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 0.9-1mdk
|
||||
- 0.9
|
||||
|
||||
* Tue Apr 05 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 0.8.2-3mdk
|
||||
- Patch1: Fix use kdesu
|
||||
|
||||
* Fri Mar 25 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 0.8.2-2mdk
|
||||
- Fix build on x86_64
|
||||
|
||||
* Fri Mar 25 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 0.8.2-1mdk
|
||||
- 0.8.2
|
||||
|
||||
* Thu Mar 24 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 0.6-1mdk
|
||||
- 0.6
|
||||
- Integrate my other patchs
|
||||
|
||||
* Wed Mar 23 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 0.5-1mdk
|
||||
- 0.5
|
||||
- Remove all my patch (all was add into release 0.5)
|
||||
|
||||
* Wed Mar 23 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 0.3-7mdk
|
||||
- Add patch7: disable action when is not root
|
||||
|
||||
* Wed Mar 23 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 0.3-6mdk
|
||||
- Add patch6: fix rootonly
|
||||
|
||||
* Wed Mar 23 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 0.3-5mdk
|
||||
- Fix menu entry
|
||||
|
||||
* Wed Mar 23 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 0.3-4mdk
|
||||
- Add patch5: fix reference
|
||||
|
||||
* Wed Mar 23 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 0.3-3mdk
|
||||
- Add patch4: fix crash when "themes" doesn't exist
|
||||
|
||||
* Wed Mar 23 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 0.3-2mdk
|
||||
- Add patch3: fix mem leak
|
||||
- Fix url
|
||||
|
||||
* Wed Mar 23 2005 Laurent MONTEL <lmontel@mandrakesoft.com> 0.3-1mdk
|
||||
- First package
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- kdmtheme-0.8.2/src/kdmtheme.desktop-- 2005-04-04 15:40:46.372622342 +0200
|
||||
+++ kdmtheme-0.8.2/src/kdmtheme.desktop 2005-04-04 15:40:58.752867432 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
-Exec=kcmshell kdmtheme
|
||||
+Exec=kdesu kcmshell kdmtheme
|
||||
Icon=kdmconfig
|
||||
Type=Application
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
--- kdmtheme-1.2.2/admin/cvs.sh.autotools 2006-11-09 23:42:52.000000000 +0100
|
||||
+++ kdmtheme-1.2.2/admin/cvs.sh 2008-02-08 08:24:11.000000000 +0100
|
||||
@@ -32,7 +32,7 @@
|
||||
required_autoconf_version="2.53 or newer"
|
||||
AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
|
||||
case $AUTOCONF_VERSION in
|
||||
- Autoconf*2.5* | autoconf*2.5* ) : ;;
|
||||
+ Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
|
||||
"" )
|
||||
echo "*** AUTOCONF NOT FOUND!."
|
||||
echo "*** KDE requires autoconf $required_autoconf_version"
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
|
||||
case $AUTOHEADER_VERSION in
|
||||
- Autoconf*2.5* | autoheader*2.5* ) : ;;
|
||||
+ Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
|
||||
"" )
|
||||
echo "*** AUTOHEADER NOT FOUND!."
|
||||
echo "*** KDE requires autoheader $required_autoconf_version"
|
||||
@@ -68,7 +68,7 @@
|
||||
echo "*** KDE requires automake $required_automake_version"
|
||||
exit 1
|
||||
;;
|
||||
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*)
|
||||
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* )
|
||||
echo "*** $AUTOMAKE_STRING found."
|
||||
UNSERMAKE=no
|
||||
;;
|
||||
@ -1,59 +0,0 @@
|
||||
Name: kde3-kicker-backgrounds
|
||||
Version: 0.1
|
||||
Release: %mkrel 4
|
||||
Summary: KDE-Look.org kicker backgrounds for KDE3
|
||||
License: GPL
|
||||
URL: http://moodwrod.com/
|
||||
Group: Graphical desktop/KDE3
|
||||
BuildArch: noarch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
Source: kicker_wallpapers-0.1.tar.bz2
|
||||
Requires: kdebase-common
|
||||
|
||||
%description
|
||||
These are background images for kicker,comes from kde-look.org
|
||||
|
||||
Included images are:
|
||||
- GlassPanels
|
||||
http://kde-look.org/CONTENT/content-files/86301-GlassPanels.tar.gz
|
||||
- Coloured flames
|
||||
http://kde-look.org/CONTENT/content-files/83263-ColouredFlames.tar.gz
|
||||
- total work pack
|
||||
http://kde-look.org/CONTENT/content-files/64870-TWarchivio.tar.gz
|
||||
|
||||
|
||||
%prep
|
||||
rm -rf %buildroot
|
||||
|
||||
%setup -q -n kicker_wallpapers-0.1
|
||||
|
||||
%build
|
||||
mkdir -p %buildroot%_kde3_appsdir/kicker/wallpapers
|
||||
for i in $(find . -name "*.png")
|
||||
do
|
||||
install -m0644 $i %buildroot%_kde3_appsdir/kicker/wallpapers
|
||||
done
|
||||
|
||||
%clean
|
||||
rm -rf %buildroot
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%_kde3_appsdir/kicker/wallpapers/*.png
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Jul 18 2011 Tim Williams <tim@my-place.org.uk> 0.1-4mvt2010.2
|
||||
+ Build for Trinity
|
||||
|
||||
* Fri Jul 23 2010 Tim Williams <tim@my-place.org.uk> 0.1-3mvt2010.1
|
||||
+ Build for MDV 2010.1
|
||||
|
||||
* Wed Feb 10 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.1-2mvt2010.0
|
||||
- Change package group
|
||||
|
||||
* Thu Nov 26 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.1-1mvt2010.0
|
||||
+ Initial RPM
|
||||
@ -1,45 +0,0 @@
|
||||
%define oname kickoff-i18n
|
||||
%define name kde3-%{oname}
|
||||
Name: %{name}
|
||||
Summary: Kickoff translations
|
||||
Version: 1.0
|
||||
Release: %mkrel 10
|
||||
Group: System/Internationalization
|
||||
License: GPL
|
||||
URL: http://www.mandriva.com
|
||||
Source0: %oname-%version.tar.bz2
|
||||
Patch0: kickoff-i18n-1.0-uz-po.patch
|
||||
Patch1: kickoff-i18n-1.0-tr-po.patch
|
||||
BuildRoot: %_tmppath/%name-%version-%release-buildroot
|
||||
BuildArch: noarch
|
||||
BuildRequires: kdelibs-devel
|
||||
Obsoletes: %{oname}
|
||||
Provides: %{oname} = %{version}-%{release}
|
||||
|
||||
%description
|
||||
kickoff translations
|
||||
|
||||
%prep
|
||||
%setup -q -n %oname-%version
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
./configure \
|
||||
--prefix=%_kde3_prefix \
|
||||
--datadir=%_kde3_datadir
|
||||
|
||||
make clean
|
||||
%make
|
||||
|
||||
%install
|
||||
rm -fr %buildroot
|
||||
%makeinstall_std
|
||||
|
||||
%find_lang kickoff
|
||||
|
||||
%clean
|
||||
rm -fr %buildroot
|
||||
|
||||
%files -f kickoff.lang
|
||||
%defattr(-,root,root,-)
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@ -1,192 +0,0 @@
|
||||
%define oldname ksplash-engine-moodin
|
||||
Name: kde3-%{oldname}
|
||||
Version: 0.4.2
|
||||
Release: %mkrel 19
|
||||
Summary: Splash Screen Engine for KDE3
|
||||
License: GPL
|
||||
URL: http://moodwrod.com/
|
||||
Group: Graphical desktop/KDE3
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
Source: http://moodwrod.com/files/%{oldname}_0.4.2.tar.bz2
|
||||
# a Qt4 based Svg render to be used in moodin
|
||||
Source1: svgrender.tar.bz2
|
||||
Patch1: moodin-autoconf.patch
|
||||
Patch2: moodin-0.4.2-fix-bug.patch
|
||||
Patch3: moodin-0.4.2-memleak-bug.patch
|
||||
Patch4: moodinkde-use-svg.patch
|
||||
Patch5: moodin-use-label-offset.patch
|
||||
Patch6: moodin-fix-svg.patch
|
||||
Patch7: moodin-automake.patch
|
||||
Patch8: moodin-external_svgrender.patch
|
||||
Patch9: moodin-fix_drawing_on_compiz.patch
|
||||
Patch10: moodin-drawing_and_scaling_fixes.patch
|
||||
Patch11: moodin-fix_svg_on_base_resolution.patch
|
||||
Patch12: kde-3.5.10-acinclude.patch
|
||||
Patch13: moodin-kdehome-kde3.patch
|
||||
BuildRequires: kde3-macros
|
||||
BuildRequires: libkde3base4-devel
|
||||
BuildRequires: art_lgpl-devel
|
||||
# for the svgrender
|
||||
BuildRequires: qt4-devel
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
%else
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
%endif
|
||||
BuildRequires: automake >= 1.6.1
|
||||
Obsoletes: %{oldname}
|
||||
Provides: %{oldname}
|
||||
|
||||
%description
|
||||
Splash Screen Engine for KDE3
|
||||
Heavily customizable engine for various types of themes
|
||||
|
||||
FEATURES:
|
||||
- Scale cache
|
||||
- Fading images
|
||||
- Use current icon set or custom images
|
||||
- Unlimited Custom text labels
|
||||
- Set fading delay and length
|
||||
- Custom image arrangement
|
||||
- Resolution independent themes
|
||||
|
||||
|
||||
%prep
|
||||
rm -rf %buildroot
|
||||
|
||||
%setup -q -n moodin -a1
|
||||
|
||||
%patch1 -p1 -b .autoconf
|
||||
%patch2 -p1 -b .fix_bug
|
||||
%patch3 -p1 -b .fix_mem_leak
|
||||
%patch4 -p1 -b .use_svg
|
||||
%patch5 -p1 -b .use_status_offset
|
||||
%patch6 -p1 -b .fix_svg
|
||||
%patch7 -p1 -b .automake
|
||||
%patch8 -p1 -b .external_svgrender
|
||||
%patch9 -p1 -b .fix_drawing
|
||||
%patch10 -p1 -b .fix_scaling
|
||||
%patch11 -p1 -b .fix_svg_base_resolution
|
||||
%if %mdkversion >= 201000
|
||||
%patch12 -p1
|
||||
%patch13 -p1
|
||||
%endif
|
||||
|
||||
|
||||
%build
|
||||
make -f admin/Makefile.common
|
||||
%configure_kde3
|
||||
|
||||
# svgrender
|
||||
pushd svgrender
|
||||
qmake
|
||||
make
|
||||
popd
|
||||
|
||||
%install
|
||||
rm -rf %buildroot
|
||||
%{makeinstall_std}
|
||||
|
||||
# svgrender
|
||||
mkdir -p %buildroot%_kde3_bindir
|
||||
install -m0755 svgrender/svgrender %buildroot%_kde3_bindir/moodin_svgrender
|
||||
|
||||
%clean
|
||||
rm -rf %buildroot
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc COPYING INSTALL AUTHORS
|
||||
%_kde3_bindir/moodin_svgrender
|
||||
%_kde3_libdir/kde3/ksplashmoodin.la
|
||||
%_kde3_libdir/kde3/ksplashmoodin.so
|
||||
%_kde3_appsdir/ksplash/Themes/FingerPrint/*.png
|
||||
%_kde3_appsdir/ksplash/Themes/FingerPrint/*.jpg
|
||||
%_kde3_appsdir/ksplash/Themes/FingerPrint/Theme.rc
|
||||
%_kde3_appsdir/ksplash/Themes/MoodinKDE/*.jpg
|
||||
%_kde3_appsdir/ksplash/Themes/MoodinKDE/*.png
|
||||
%_kde3_appsdir/ksplash/Themes/MoodinKDE/Theme.rc
|
||||
%_kde3_datadir/services/ksplashmoodin.desktop
|
||||
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
|
||||
* Thu Jul 14 2011 Tim Williams <tim@my-place.ortg.uk> 0.4.2-19mvt2010.2
|
||||
+ rebuild for MDV 2010.2/Trinity KDE
|
||||
|
||||
* Mon Jul 19 2010 Tim Williams <tim@my-place.ortg.uk> 0.4.2-18mvt2010.1
|
||||
+ Rebuild for MDV 2010.1
|
||||
|
||||
* Thu Feb 18 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.4.2-17mvt2010.0
|
||||
+ Make default config dir as$HOME/.kde3 to avoid future conflicts with KDE4
|
||||
|
||||
* Fri Feb 12 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.4.2-16mvt2010.0
|
||||
+ KDE builds with autoconf 2.65, add patch for this and
|
||||
set autoconf to version 2.65
|
||||
- Rename package name and group to avoid possible future kde4 conflicts
|
||||
|
||||
* Thu Nov 26 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.4.2-15mvt2010.0
|
||||
+ Rename package to avoid unvanted KDE4 upgrade
|
||||
|
||||
* Fri Nov 13 2009 Tim Williams <tim@my-place.org.uk> 0.4.2-14mdv2009.0
|
||||
+ Rebuild for MDV 2010.0
|
||||
|
||||
* Sun Jul 13 2008 Nicolas Lécureuil <neoclust@mandriva.org> 0.4.2-13mdv2009.0
|
||||
+ Revision: 234340
|
||||
- Rebuild
|
||||
|
||||
* Thu May 08 2008 Helio Chissini de Castro <helio@mandriva.com> 0.4.2-12mdv2009.0
|
||||
+ Revision: 204726
|
||||
- Move to /opt
|
||||
|
||||
* Thu Feb 28 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.4.2-11mdv2008.1
|
||||
+ Revision: 176248
|
||||
- Fix svg rendering when the screen resolution is the same as the base resolution
|
||||
|
||||
* Wed Feb 27 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.4.2-10mdv2008.1
|
||||
+ Revision: 175815
|
||||
- Add a patch fixing many problems of Moodin:
|
||||
* Inter-widget transparency
|
||||
* scaling images when using a svg background
|
||||
* Proper handling svg images.
|
||||
|
||||
* Tue Feb 26 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.4.2-9mdv2008.1
|
||||
+ Revision: 175394
|
||||
- Add a patch fixing drawing when compiz is running
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- fix no-buildroot-tag
|
||||
|
||||
* Thu Jan 03 2008 Oden Eriksson <oeriksson@mandriva.com> 0.4.2-8mdv2008.1
|
||||
+ Revision: 141782
|
||||
- rebuilt against openldap-2.4.7 libs
|
||||
|
||||
* Thu Dec 20 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 0.4.2-7mdv2008.1
|
||||
+ Revision: 135891
|
||||
- Fix automake 1.10 detection
|
||||
- Use an external svg rendering helper (Qt4 based)
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
|
||||
|
||||
* Wed Feb 14 2007 Laurent Montel <lmontel@mandriva.com> 0.4.2-6mdv2007.0
|
||||
+ Revision: 120903
|
||||
- Fix svg
|
||||
|
||||
* Wed Feb 14 2007 Laurent Montel <lmontel@mandriva.com> 0.4.2-5mdv2007.1
|
||||
+ Revision: 120754
|
||||
- Improve
|
||||
- Fix other mem leak
|
||||
- Fix some mem leak
|
||||
- Fix configure
|
||||
- Import ksplash-engine-moodin
|
||||
|
||||
* Mon Jul 03 2006 Nicolas Lécureuil <neoclust@mandriva.org> 0.4.2-2mdv2007.0
|
||||
- Rebuild for new extension
|
||||
|
||||
* Sun Dec 18 2005 Sebastien Savarin <plouf@mandriva.org> 0.4.2-1mdk
|
||||
- First Mandriva Linux release
|
||||
|
||||
@ -1,79 +0,0 @@
|
||||
--- moodin/src/magiclabel.cpp-- 2007-01-26 14:47:28.000000000 +0100
|
||||
+++ moodin/src/magiclabel.cpp 2007-01-26 14:48:48.000000000 +0100
|
||||
@@ -21,7 +21,7 @@
|
||||
// This class is still very simple (as most of the classes)
|
||||
// They get all improved later when "OpenGL Effect Widget" structure is completed
|
||||
|
||||
-MagicLabel::MagicLabel(QString s, bool translate)
|
||||
+MagicLabel::MagicLabel(const QString &s, bool translate)
|
||||
{
|
||||
prefix = "ML:";
|
||||
preUSER = "USER:";
|
||||
@@ -73,7 +73,11 @@
|
||||
mValue = "";
|
||||
|
||||
if (!proc->start(KProcess::Block, KProcess::Stdout))
|
||||
+ {
|
||||
+ delete proc;
|
||||
+ //TODO add i18n
|
||||
KMessageBox::information(0, QString("Could not start process: %1").arg(cmd));
|
||||
+ }
|
||||
}
|
||||
|
||||
|
||||
--- moodin/src/cache.cpp-- 2007-01-26 14:45:16.000000000 +0100
|
||||
+++ moodin/src/cache.cpp 2007-01-26 14:46:11.000000000 +0100
|
||||
@@ -81,7 +81,7 @@
|
||||
}
|
||||
|
||||
|
||||
-void Cache::writeInfoFile(QString& file)
|
||||
+void Cache::writeInfoFile(const QString& file)
|
||||
{
|
||||
QFileInfo fi(getFile(file));
|
||||
|
||||
@@ -91,7 +91,7 @@
|
||||
}
|
||||
|
||||
|
||||
-bool Cache::isInSync(QString& file)
|
||||
+bool Cache::isInSync(const QString& file)
|
||||
{
|
||||
QFileInfo fi(getFile(file));
|
||||
|
||||
@@ -103,7 +103,7 @@
|
||||
}
|
||||
|
||||
|
||||
-QString Cache::getFile(QString file)
|
||||
+QString Cache::getFile(const QString &file)
|
||||
{
|
||||
return mCacheDir.filePath(file);
|
||||
}
|
||||
--- moodin/src/cache.h-- 2007-01-26 14:45:21.000000000 +0100
|
||||
+++ moodin/src/cache.h 2007-01-26 14:46:15.000000000 +0100
|
||||
@@ -28,10 +28,10 @@
|
||||
Scaler* mScaler;
|
||||
|
||||
void createCacheDir();
|
||||
- void writeInfoFile(QString& file);
|
||||
- bool isInSync(QString& file);
|
||||
+ void writeInfoFile(const QString& file);
|
||||
+ bool isInSync(const QString& file);
|
||||
|
||||
- QString getFile(QString file);
|
||||
+ QString getFile(const QString &file);
|
||||
|
||||
public:
|
||||
Cache(Scaler* scaler, const QString& mThemeEngine, const QString& theme);
|
||||
--- moodin/src/magiclabel.h-- 2007-01-26 14:47:34.000000000 +0100
|
||||
+++ moodin/src/magiclabel.h 2007-01-26 14:47:53.000000000 +0100
|
||||
@@ -36,7 +36,7 @@
|
||||
void receivedStdout(KProcess *proc, char *buffer, int buflen);
|
||||
|
||||
public:
|
||||
- MagicLabel(QString s, bool translate);
|
||||
+ MagicLabel(const QString &s, bool translate);
|
||||
|
||||
inline QString& value() { return mValue; };
|
||||
};
|
||||
@ -1,15 +0,0 @@
|
||||
--- moodin/src/thememoodin.cpp-- 2007-01-26 14:56:48.000000000 +0100
|
||||
+++ moodin/src/thememoodin.cpp 2007-01-26 14:57:20.000000000 +0100
|
||||
@@ -81,8 +81,10 @@
|
||||
mImageSpacer = cfg->readNumEntry("ImageSpacer", mUseIconSet ? mIconSetSize : 0);
|
||||
mUsersBackground = cfg->readBoolEntry("UsersBackground", false);
|
||||
mLabelCount = cfg->readNumEntry("Labels", 0);
|
||||
- mLabelShadowOffset = cfg->readPointEntry("LabelShadowOffset", new QPoint(2, 2));
|
||||
- mBaseResolution = cfg->readSizeEntry("BaseResolution", new QSize(1280, 1024));
|
||||
+ QPoint pos(2,2);
|
||||
+ mLabelShadowOffset = cfg->readPointEntry("LabelShadowOffset", &pos);
|
||||
+ QSize size(1280, 1024);
|
||||
+ mBaseResolution = cfg->readSizeEntry("BaseResolution", &size);
|
||||
mTranslate = cfg->readBoolEntry("Translate", true);
|
||||
mLineUpImages = cfg->readBoolEntry("LineUpImages", false);
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
--- moodin/admin/cvs.sh-- 2007-01-26 14:36:43.000000000 +0100
|
||||
+++ moodin/admin/cvs.sh 2007-01-26 14:37:10.000000000 +0100
|
||||
@@ -32,7 +32,7 @@
|
||||
required_autoconf_version="2.53 or newer"
|
||||
AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
|
||||
case $AUTOCONF_VERSION in
|
||||
- Autoconf*2.5* | autoconf*2.5* ) : ;;
|
||||
+ Autoconf*2.5* | autoconf*2.5* | autoconf*2.6* ) : ;;
|
||||
"" )
|
||||
echo "*** AUTOCONF NOT FOUND!."
|
||||
echo "*** KDE requires autoconf $required_autoconf_version"
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
|
||||
case $AUTOHEADER_VERSION in
|
||||
- Autoconf*2.5* | autoheader*2.5* ) : ;;
|
||||
+ Autoconf*2.5* | autoheader*2.5* | autoheader*2.6* ) : ;;
|
||||
"" )
|
||||
echo "*** AUTOHEADER NOT FOUND!."
|
||||
echo "*** KDE requires autoheader $required_autoconf_version"
|
||||
--- moodin/admin/detect-autoconf.sh-- 2007-01-26 14:37:38.000000000 +0100
|
||||
+++ moodin/admin/detect-autoconf.sh 2007-01-26 14:37:52.000000000 +0100
|
||||
@@ -10,7 +10,7 @@
|
||||
# Please add higher versions first. The last version number is the minimum
|
||||
# needed to compile KDE. Do not forget to include the name/version #
|
||||
# separator if one is present, e.g. -1.2 where - is the separator.
|
||||
-KDE_AUTOCONF_VERS="-2.58 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x"
|
||||
+KDE_AUTOCONF_VERS="-2.65 -2.63 -2.62 -2.61 -2.60 -2.58 -2.57 257 -2.54 -2.53a -2.53 -2.52 -2.5x"
|
||||
KDE_AUTOMAKE_VERS="-1.7 17 -1.6"
|
||||
|
||||
# We don't use variable here for remembering the type ... strings. Local
|
||||
@ -1,12 +0,0 @@
|
||||
diff -p -up moodin/admin/cvs.sh.automake moodin/admin/cvs.sh
|
||||
--- moodin/admin/cvs.sh.automake 2007-12-20 13:29:30.000000000 -0200
|
||||
+++ moodin/admin/cvs.sh 2007-12-20 13:29:53.000000000 -0200
|
||||
@@ -68,7 +68,7 @@ case $AUTOMAKE_STRING in
|
||||
echo "*** KDE requires automake $required_automake_version"
|
||||
exit 1
|
||||
;;
|
||||
- automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9*)
|
||||
+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* )
|
||||
echo "*** $AUTOMAKE_STRING found."
|
||||
UNSERMAKE=no
|
||||
;;
|
||||
@ -1,144 +0,0 @@
|
||||
diff -p -up moodin/src/cache.cpp.orig moodin/src/cache.cpp
|
||||
diff -p -up moodin/src/magiclabel.h.orig moodin/src/magiclabel.h
|
||||
diff -p -up moodin/src/cache.h.orig moodin/src/cache.h
|
||||
diff -p -up moodin/src/thememoodin.cpp.orig moodin/src/thememoodin.cpp
|
||||
--- moodin/src/thememoodin.cpp.orig 2008-02-26 17:46:36.000000000 -0300
|
||||
+++ moodin/src/thememoodin.cpp 2008-02-26 17:47:26.000000000 -0300
|
||||
@@ -88,11 +88,11 @@ void ThemeMoodin::readSettings()
|
||||
mLabelShadowOffset = cfg->readPointEntry("LabelShadowOffset", &pos);
|
||||
QSize size(1280, 1024);
|
||||
mBaseResolution = cfg->readSizeEntry("BaseResolution", &size);
|
||||
- //For svg image use a negative size => force to create it.
|
||||
+/* //For svg image use a negative size => force to create it.
|
||||
if(!mUsersBackground && (mBackgroundImage.endsWith(".svg") || mBackgroundImage.endsWith(".svgz"))) {
|
||||
mBaseResolution=QSize();
|
||||
}
|
||||
-
|
||||
+*/
|
||||
mTranslate = cfg->readBoolEntry("Translate", true);
|
||||
mLineUpImages = cfg->readBoolEntry("LineUpImages", false);
|
||||
|
||||
@@ -325,7 +325,13 @@ EffectWidget* ThemeMoodin::createEffectW
|
||||
fw->setFixedSize(image->size());
|
||||
fw->setImage(image);
|
||||
fw->setStart(mBeginOpacity);
|
||||
- fw->show();
|
||||
+ //fw->show();
|
||||
+
|
||||
+ for (EffectWidget *f = mEffectWidgets.first(); f; f = mEffectWidgets.next())
|
||||
+ {
|
||||
+ connect(f, SIGNAL(cacheNeedsUpdate()), fw, SLOT(updateCache()));
|
||||
+ connect(fw, SIGNAL(cacheNeedsUpdate()), f, SLOT(updateCache()));
|
||||
+ }
|
||||
|
||||
return fw;
|
||||
}
|
||||
@@ -358,7 +364,10 @@ void ThemeMoodin::slotSetPixmap(const QS
|
||||
EffectWidget *fw = mEffectWidgets.at(n);
|
||||
|
||||
if (fw)
|
||||
+ {
|
||||
+ fw->show();
|
||||
fw->start();
|
||||
+ }
|
||||
|
||||
repaint(false);
|
||||
}
|
||||
diff -p -up moodin/src/thememoodin.h.orig moodin/src/thememoodin.h
|
||||
diff -p -up moodin/src/magiclabel.cpp.orig moodin/src/magiclabel.cpp
|
||||
diff -p -up moodin/src/effectwidget.h.orig moodin/src/effectwidget.h
|
||||
--- moodin/src/effectwidget.h.orig 2008-02-26 17:46:36.000000000 -0300
|
||||
+++ moodin/src/effectwidget.h 2008-02-26 17:48:33.000000000 -0300
|
||||
@@ -45,10 +45,12 @@ class EffectWidget : public QWidget
|
||||
void resizeEvent(QResizeEvent *);
|
||||
void moveEvent(QMoveEvent *);
|
||||
|
||||
- void updateCache();
|
||||
+signals:
|
||||
+ void cacheNeedsUpdate();
|
||||
|
||||
public slots:
|
||||
void timerTick();
|
||||
+ void updateCache();
|
||||
|
||||
private:
|
||||
static QImage *bgImage;
|
||||
@@ -64,6 +66,7 @@ class EffectWidget : public QWidget
|
||||
float
|
||||
beginOpacity,
|
||||
endOpacity;
|
||||
+ bool bgUpdated;
|
||||
};
|
||||
|
||||
#endif
|
||||
diff -p -up moodin/src/scaler.h.orig moodin/src/scaler.h
|
||||
diff -p -up moodin/src/effectwidget.cpp.orig moodin/src/effectwidget.cpp
|
||||
--- moodin/src/effectwidget.cpp.orig 2008-02-26 17:46:36.000000000 -0300
|
||||
+++ moodin/src/effectwidget.cpp 2008-02-26 17:46:40.000000000 -0300
|
||||
@@ -34,6 +34,8 @@ EffectWidget::EffectWidget(QWidget* pare
|
||||
setBackgroundMode(NoBackground);
|
||||
setBackgroundOrigin(QWidget::ParentOrigin);
|
||||
updateCache();
|
||||
+
|
||||
+ bgUpdated = false;
|
||||
}
|
||||
|
||||
|
||||
@@ -157,7 +159,17 @@ void EffectWidget::paintEvent(QPaintEven
|
||||
|
||||
QImage upper = image->copy();
|
||||
QImage lower = background.copy();
|
||||
- KImageEffect::blendOnLower(upper, lower, KImageEffect::Centered, (currentStep + 1 == totalSteps) ? 1.0 : endOpacity / float(totalSteps) * float(currentStep) + beginOpacity);
|
||||
+
|
||||
+ if ((currentStep + 1 == totalSteps) && !bgUpdated)
|
||||
+ {
|
||||
+ bgUpdated = true;
|
||||
+ KImageEffect::blendOnLower(upper, lower, KImageEffect::Centered, 1.0);
|
||||
+ QPoint p(mapToGlobal(QPoint(0,0)));
|
||||
+ bitBlt(bgImage, p.x(), p.y(), &lower, 0, 0, -1, -1, 0);
|
||||
+ emit cacheNeedsUpdate();
|
||||
+ }
|
||||
+ else
|
||||
+ KImageEffect::blendOnLower(upper, lower, KImageEffect::Centered, endOpacity / float(totalSteps) * float(currentStep) + beginOpacity);
|
||||
|
||||
bitBlt(this, 0, 0, &lower);
|
||||
}
|
||||
diff -p -up moodin/src/scaler.cpp.orig moodin/src/scaler.cpp
|
||||
--- moodin/src/scaler.cpp.orig 2008-02-26 17:46:36.000000000 -0300
|
||||
+++ moodin/src/scaler.cpp 2008-02-26 17:47:44.000000000 -0300
|
||||
@@ -15,16 +15,7 @@
|
||||
|
||||
Scaler::Scaler(QSize baseResolution, QSize targetResolution)
|
||||
{
|
||||
- if(mBaseResolution.isValid())
|
||||
- {
|
||||
- mBaseResolution = baseResolution;
|
||||
- mSvgFile =false;
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- mBaseResolution = targetResolution;
|
||||
- mSvgFile = true;
|
||||
- }
|
||||
+ mBaseResolution = baseResolution;
|
||||
mTargetResolution = targetResolution;
|
||||
}
|
||||
|
||||
@@ -53,7 +44,7 @@ void Scaler::autoCoords(QPoint* pt, cons
|
||||
|
||||
void Scaler::scaleCoords(QPoint* pt)
|
||||
{
|
||||
- if (!mSvgFile && (mBaseResolution == mTargetResolution))
|
||||
+ if (mBaseResolution == mTargetResolution)
|
||||
return;
|
||||
|
||||
int ox = pt->x();
|
||||
@@ -104,7 +95,7 @@ bool Scaler::scaleSize(QFont* f)
|
||||
|
||||
bool Scaler::resolutionDiff()
|
||||
{
|
||||
- return (mSvgFile || (mBaseResolution != mTargetResolution));
|
||||
+ return (mBaseResolution != mTargetResolution);
|
||||
}
|
||||
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
diff -p -up moodin/src/cache.cpp.external_svgrender moodin/src/cache.cpp
|
||||
--- moodin/src/cache.cpp.external_svgrender 2007-12-20 15:15:29.000000000 -0200
|
||||
+++ moodin/src/cache.cpp 2007-12-20 16:12:35.000000000 -0200
|
||||
@@ -13,9 +13,9 @@
|
||||
#include <kstandarddirs.h>
|
||||
#include <kconfig.h>
|
||||
|
||||
-#ifdef HAVE_LIBART
|
||||
-#include <ksvgiconengine.h>
|
||||
-#endif
|
||||
+// for external svg rendering
|
||||
+#include <ktempfile.h>
|
||||
+#include <kprocess.h>
|
||||
|
||||
#include <qfileinfo.h>
|
||||
#include <qdatetime.h>
|
||||
@@ -49,22 +49,18 @@ QImage* Cache::cacheFile(const QString&
|
||||
{
|
||||
QImage *i;
|
||||
if (file.endsWith(".svg") || file.endsWith(".svgz")) {
|
||||
-#ifdef HAVE_LIBART
|
||||
- KSVGIconEngine* svgEngine = new KSVGIconEngine();
|
||||
- QSize size = mScaler->targetResolution();
|
||||
- if (svgEngine->load(size.width(), size.height(), file )) {
|
||||
- QImage *image = svgEngine->image();
|
||||
- i = new QImage(*image);
|
||||
- delete image;
|
||||
- i->save(cachedFile.name(), QImage::imageFormat(file));
|
||||
- } else {
|
||||
- kdWarning() << "failed to load SVG file " << file << endl;
|
||||
- }
|
||||
- delete svgEngine;
|
||||
-#else
|
||||
- kdWarning() << k_funcinfo
|
||||
- << "tried to load SVG file but libart not installed" << endl;
|
||||
-#endif
|
||||
+ QSize size = mScaler->targetResolution();
|
||||
+ KProcess proc;
|
||||
+ proc << "moodin_svgrender";
|
||||
+ KTempFile tmp("/tmp/moodin_cache", ".png");
|
||||
+ tmp.setAutoDelete(false);
|
||||
+ tmp.close();
|
||||
+ proc << QString::number(size.width()) << QString::number(size.height()) << file << tmp.name();
|
||||
+ proc.start(KProcess::Block);
|
||||
+
|
||||
+ i = new QImage(tmp.name());
|
||||
+ if (i->save(cachedFile.name(), "PNG"))
|
||||
+ QFile(tmp.name()).remove();
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -1,67 +0,0 @@
|
||||
--- moodin/src/scaler.cpp-- 2007-02-14 15:22:06.000000000 +0100
|
||||
+++ moodin/src/scaler.cpp 2007-02-14 15:22:16.000000000 +0100
|
||||
@@ -15,7 +15,16 @@
|
||||
|
||||
Scaler::Scaler(QSize baseResolution, QSize targetResolution)
|
||||
{
|
||||
- mBaseResolution = baseResolution;
|
||||
+ if(mBaseResolution.isValid())
|
||||
+ {
|
||||
+ mBaseResolution = baseResolution;
|
||||
+ mSvgFile =false;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ mBaseResolution = targetResolution;
|
||||
+ mSvgFile = true;
|
||||
+ }
|
||||
mTargetResolution = targetResolution;
|
||||
}
|
||||
|
||||
@@ -44,7 +53,7 @@
|
||||
|
||||
void Scaler::scaleCoords(QPoint* pt)
|
||||
{
|
||||
- if (mBaseResolution == mTargetResolution)
|
||||
+ if (!mSvgFile && (mBaseResolution == mTargetResolution))
|
||||
return;
|
||||
|
||||
int ox = pt->x();
|
||||
@@ -95,7 +104,7 @@
|
||||
|
||||
bool Scaler::resolutionDiff()
|
||||
{
|
||||
- return (mBaseResolution != mTargetResolution);
|
||||
+ return (mSvgFile || (mBaseResolution != mTargetResolution));
|
||||
}
|
||||
|
||||
|
||||
--- moodin/src/scaler.h-- 2007-02-14 15:22:09.000000000 +0100
|
||||
+++ moodin/src/scaler.h 2007-02-14 15:22:20.000000000 +0100
|
||||
@@ -21,6 +21,7 @@
|
||||
private:
|
||||
QSize mBaseResolution;
|
||||
QSize mTargetResolution;
|
||||
+ bool mSvgFile;
|
||||
|
||||
public:
|
||||
Scaler(QSize baseResolution, QSize targetResolution);
|
||||
--- moodin/src/thememoodin.cpp-- 2007-02-14 15:23:53.000000000 +0100
|
||||
+++ moodin/src/thememoodin.cpp 2007-02-14 15:24:40.000000000 +0100
|
||||
@@ -88,7 +88,7 @@
|
||||
mBaseResolution = cfg->readSizeEntry("BaseResolution", &size);
|
||||
//For svg image use a negative size => force to create it.
|
||||
if(!mUsersBackground && (mBackgroundImage.endsWith(".svg") || mBackgroundImage.endsWith(".svgz"))) {
|
||||
- mBaseResolution=QSize(-1,-1);
|
||||
+ mBaseResolution=QSize();
|
||||
}
|
||||
|
||||
mTranslate = cfg->readBoolEntry("Translate", true);
|
||||
@@ -248,7 +248,6 @@
|
||||
else
|
||||
{
|
||||
QString name = mTheme->locateThemeData(*it);
|
||||
-
|
||||
if (name.isEmpty())
|
||||
continue;
|
||||
|
||||
@ -1,67 +0,0 @@
|
||||
diff -p -up moodin/src/effectwidget.cpp.fix_drawing moodin/src/effectwidget.cpp
|
||||
diff -p -up moodin/src/scaler.cpp.fix_drawing moodin/src/scaler.cpp
|
||||
diff -p -up moodin/src/effectwidget.h.fix_drawing moodin/src/effectwidget.h
|
||||
diff -p -up moodin/src/magiclabel.h.fix_drawing moodin/src/magiclabel.h
|
||||
diff -p -up moodin/src/thememoodin.h.fix_drawing moodin/src/thememoodin.h
|
||||
--- moodin/src/thememoodin.h.fix_drawing 2008-02-26 10:30:05.000000000 -0300
|
||||
+++ moodin/src/thememoodin.h 2008-02-26 10:46:14.000000000 -0300
|
||||
@@ -96,7 +96,6 @@ private:
|
||||
QPoint mStatusCoords;
|
||||
QPoint mLabelShadowOffset;
|
||||
QPoint mStatusOffsets;
|
||||
- QWidget* mContainer;
|
||||
QSize mBaseResolution;
|
||||
QRect mSplashRect;
|
||||
|
||||
diff -p -up moodin/src/scaler.h.fix_drawing moodin/src/scaler.h
|
||||
diff -p -up moodin/src/cache.h.fix_drawing moodin/src/cache.h
|
||||
diff -p -up moodin/src/thememoodin.cpp.fix_drawing moodin/src/thememoodin.cpp
|
||||
--- moodin/src/thememoodin.cpp.fix_drawing 2008-02-26 10:30:05.000000000 -0300
|
||||
+++ moodin/src/thememoodin.cpp 2008-02-26 10:46:14.000000000 -0300
|
||||
@@ -39,6 +39,8 @@ ThemeMoodin::ThemeMoodin(QWidget* parent
|
||||
{
|
||||
readSettings();
|
||||
init();
|
||||
+ QLayout *l = layout();
|
||||
+ delete l;
|
||||
}
|
||||
|
||||
|
||||
@@ -122,8 +124,6 @@ void ThemeMoodin::init()
|
||||
setBackgroundMode(NoBackground);
|
||||
setFixedSize(mSplashRect.size());
|
||||
|
||||
- mContainer = new QWidget(this);
|
||||
- mContainer->setFixedSize(size());
|
||||
mScaler = new Scaler(mBaseResolution, size());
|
||||
mCache = new Cache(mScaler, mTheme->themeEngine(), mTheme->theme());
|
||||
mBG = new KPixmap();
|
||||
@@ -260,7 +260,7 @@ void ThemeMoodin::initEffectWidgets()
|
||||
}
|
||||
}
|
||||
|
||||
- fadeWidget = createEffectWidget(mContainer, image);
|
||||
+ fadeWidget = createEffectWidget(this, image);
|
||||
mEffectWidgets.append(fadeWidget);
|
||||
mImages.append(image);
|
||||
arrangeWidget(fadeWidget, index);
|
||||
@@ -367,7 +367,7 @@ void ThemeMoodin::slotSetPixmap(const QS
|
||||
void ThemeMoodin::updateStatus()
|
||||
{
|
||||
QPainter p;
|
||||
- p.begin(mContainer);
|
||||
+ p.begin(this);
|
||||
|
||||
// use a copy, otherwise status messages move around
|
||||
QPoint pt = mStatusCoords;
|
||||
@@ -396,7 +396,7 @@ void ThemeMoodin::paintEvent(QPaintEvent
|
||||
{
|
||||
QRect r = pe->rect();
|
||||
|
||||
- bitBlt(mContainer, r.x(), r.y(), mBG, r.x(), r.y(), r.width(), r.height());
|
||||
+ bitBlt(this, r.x(), r.y(), mBG, r.x(), r.y(), r.width(), r.height());
|
||||
|
||||
if (mShowStatusText)
|
||||
updateStatus();
|
||||
diff -p -up moodin/src/magiclabel.cpp.fix_drawing moodin/src/magiclabel.cpp
|
||||
diff -p -up moodin/src/cache.cpp.fix_drawing moodin/src/cache.cpp
|
||||
@ -1,12 +0,0 @@
|
||||
diff -p -up moodin/src/cache.cpp.orig moodin/src/cache.cpp
|
||||
--- moodin/src/cache.cpp.orig 2008-02-28 11:50:22.000000000 -0300
|
||||
+++ moodin/src/cache.cpp 2008-02-28 11:50:30.000000000 -0300
|
||||
@@ -41,7 +41,7 @@ QImage* Cache::cacheFile(const QString&
|
||||
QStringList parts = QStringList::split("/", file);
|
||||
QFile cachedFile(mCacheDir.filePath(parts.last()));
|
||||
|
||||
- if (!mScaler->resolutionDiff())
|
||||
+ if (!mScaler->resolutionDiff() && !file.endsWith(".svg") && !file.endsWith(".svgz"))
|
||||
return new QImage(file);
|
||||
else if (isInSync(parts.last()) && cachedFile.exists())
|
||||
return new QImage(cachedFile.name());
|
||||
@ -1,48 +0,0 @@
|
||||
diff -Naur moodin/src/cache.cpp moodin-yeni/src/cache.cpp
|
||||
--- moodin/src/cache.cpp 2010-02-18 18:39:32.860704557 +0200
|
||||
+++ moodin-yeni/src/cache.cpp 2010-02-18 18:40:29.325697870 +0200
|
||||
@@ -80,7 +80,7 @@
|
||||
void Cache::createCacheDir()
|
||||
{
|
||||
KUser user;
|
||||
- QString path = user.homeDir() + "/.kde/" + KStandardDirs::kde_default("data");
|
||||
+ QString path = user.homeDir() + "/.kde3/" + KStandardDirs::kde_default("data");
|
||||
path += QString("ksplash/cache/%1/%2/%3x%4").arg(mThemeEngine).arg(mTheme).arg(mScaler->targetResolution().width()).arg(mScaler->targetResolution().height()) + "/";
|
||||
|
||||
mCacheDir.setPath(path);
|
||||
diff -Naur moodin/src/cache.cpp.external_svgrender moodin-yeni/src/cache.cpp.external_svgrender
|
||||
--- moodin/src/cache.cpp.external_svgrender 2010-02-18 18:39:32.853704409 +0200
|
||||
+++ moodin-yeni/src/cache.cpp.external_svgrender 2010-02-18 18:40:54.849698306 +0200
|
||||
@@ -84,7 +84,7 @@
|
||||
void Cache::createCacheDir()
|
||||
{
|
||||
KUser user;
|
||||
- QString path = user.homeDir() + "/.kde/" + KStandardDirs::kde_default("data");
|
||||
+ QString path = user.homeDir() + "/.kde3/" + KStandardDirs::kde_default("data");
|
||||
path += QString("ksplash/cache/%1/%2/%3x%4").arg(mThemeEngine).arg(mTheme).arg(mScaler->targetResolution().width()).arg(mScaler->targetResolution().height()) + "/";
|
||||
|
||||
mCacheDir.setPath(path);
|
||||
diff -Naur moodin/src/cache.cpp.fix_svg_base_resolution moodin-yeni/src/cache.cpp.fix_svg_base_resolution
|
||||
--- moodin/src/cache.cpp.fix_svg_base_resolution 2010-02-18 18:39:32.857698566 +0200
|
||||
+++ moodin-yeni/src/cache.cpp.fix_svg_base_resolution 2010-02-18 18:41:08.230573595 +0200
|
||||
@@ -80,7 +80,7 @@
|
||||
void Cache::createCacheDir()
|
||||
{
|
||||
KUser user;
|
||||
- QString path = user.homeDir() + "/.kde/" + KStandardDirs::kde_default("data");
|
||||
+ QString path = user.homeDir() + "/.kde3/" + KStandardDirs::kde_default("data");
|
||||
path += QString("ksplash/cache/%1/%2/%3x%4").arg(mThemeEngine).arg(mTheme).arg(mScaler->targetResolution().width()).arg(mScaler->targetResolution().height()) + "/";
|
||||
|
||||
mCacheDir.setPath(path);
|
||||
diff -Naur moodin/src/cache.cpp.use_svg moodin-yeni/src/cache.cpp.use_svg
|
||||
--- moodin/src/cache.cpp.use_svg 2010-02-18 18:39:32.851698558 +0200
|
||||
+++ moodin-yeni/src/cache.cpp.use_svg 2010-02-18 18:41:19.418697990 +0200
|
||||
@@ -59,7 +59,7 @@
|
||||
void Cache::createCacheDir()
|
||||
{
|
||||
KUser user;
|
||||
- QString path = user.homeDir() + "/.kde/" + KStandardDirs::kde_default("data");
|
||||
+ QString path = user.homeDir() + "/.kde3/" + KStandardDirs::kde_default("data");
|
||||
path += QString("ksplash/cache/%1/%2/%3x%4").arg(mThemeEngine).arg(mTheme).arg(mScaler->targetResolution().width()).arg(mScaler->targetResolution().height()) + "/";
|
||||
|
||||
mCacheDir.setPath(path);
|
||||
@ -1,29 +0,0 @@
|
||||
--- moodin/src/thememoodin.cpp-- 2007-02-12 15:56:48.000000000 +0100
|
||||
+++ moodin/src/thememoodin.cpp 2007-02-12 15:59:37.000000000 +0100
|
||||
@@ -69,6 +69,7 @@
|
||||
mStatusColor = cfg->readColorEntry("StatusColor", &defaultColor);
|
||||
mStatusFont = cfg->readFontEntry("StatusFont", &defaultStatusFont);
|
||||
mStatusCoords = cfg->readPointEntry("StatusCoords", &defaultPoint);
|
||||
+ mStatusOffsets = cfg->readPointEntry("StatusOffsets", &defaultOffset);
|
||||
mLabelShadow = cfg->readBoolEntry("LabelShadow", true);
|
||||
mLabelShadowColor = cfg->readColorEntry("LabelShadowColor", &defaultShadowColor);
|
||||
mShowStatusText = cfg->readBoolEntry("ShowStatusText", true);
|
||||
@@ -378,6 +379,8 @@
|
||||
|
||||
mScaler->autoCoords(&pt, fmSize);
|
||||
|
||||
+ pt+=mStatusOffsets;
|
||||
+
|
||||
p.setFont(mStatusFont);
|
||||
|
||||
if (mLabelShadow)
|
||||
--- moodin/src/thememoodin.h-- 2007-02-12 15:58:54.000000000 +0100
|
||||
+++ moodin/src/thememoodin.h 2007-02-12 15:59:27.000000000 +0100
|
||||
@@ -95,6 +95,7 @@
|
||||
QFont mStatusFont;
|
||||
QPoint mStatusCoords;
|
||||
QPoint mLabelShadowOffset;
|
||||
+ QPoint mStatusOffsets;
|
||||
QWidget* mContainer;
|
||||
QSize mBaseResolution;
|
||||
QRect mSplashRect;
|
||||
@ -1,138 +0,0 @@
|
||||
--- moodin/src/thememoodin.cpp-- 2007-01-26 15:44:28.000000000 +0100
|
||||
+++ moodin/src/thememoodin.cpp 2007-01-26 17:11:34.000000000 +0100
|
||||
@@ -85,6 +85,11 @@
|
||||
mLabelShadowOffset = cfg->readPointEntry("LabelShadowOffset", &pos);
|
||||
QSize size(1280, 1024);
|
||||
mBaseResolution = cfg->readSizeEntry("BaseResolution", &size);
|
||||
+ //For svg image use a negative size => force to create it.
|
||||
+ if(!mUsersBackground && (mBackgroundImage.endsWith(".svg") || mBackgroundImage.endsWith(".svgz"))) {
|
||||
+ mBaseResolution=QSize(-1,-1);
|
||||
+ }
|
||||
+
|
||||
mTranslate = cfg->readBoolEntry("Translate", true);
|
||||
mLineUpImages = cfg->readBoolEntry("LineUpImages", false);
|
||||
|
||||
@@ -154,15 +159,22 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
- if (!mBackgroundImage.isEmpty())
|
||||
+ //Absolute path
|
||||
+ if(mBackgroundImage.startsWith("/"))
|
||||
+ bgImage = mBackgroundImage;
|
||||
+ else if (!mBackgroundImage.isEmpty())
|
||||
bgImage = mTheme->locateThemeData(mBackgroundImage);
|
||||
}
|
||||
|
||||
if (bgImage.isEmpty())
|
||||
+ {
|
||||
bgImage = mTheme->locateThemeData(QString("Background-%1x%2.jpg").arg(width()).arg(height()));
|
||||
+ }
|
||||
|
||||
if (bgImage.isEmpty())
|
||||
+ {
|
||||
bgImage = mTheme->locateThemeData("Background.jpg");
|
||||
+ }
|
||||
|
||||
if (bgImage.isEmpty())
|
||||
{
|
||||
--- moodin/src/cache.cpp-- 2007-01-26 15:49:06.000000000 +0100
|
||||
+++ moodin/src/cache.cpp 2007-01-26 17:16:05.000000000 +0100
|
||||
@@ -8,15 +8,19 @@
|
||||
* (at your option) any later version. *
|
||||
* *
|
||||
***************************************************************************/
|
||||
-
|
||||
+#include <config.h>
|
||||
#include <kuser.h>
|
||||
#include <kstandarddirs.h>
|
||||
#include <kconfig.h>
|
||||
|
||||
+#ifdef HAVE_LIBART
|
||||
+#include <ksvgiconengine.h>
|
||||
+#endif
|
||||
+
|
||||
#include <qfileinfo.h>
|
||||
#include <qdatetime.h>
|
||||
#include <qimage.h>
|
||||
-
|
||||
+#include <kdebug.h>
|
||||
#include "cache.h"
|
||||
|
||||
Cache::Cache(Scaler* scaler, const QString& themeEngine, const QString& theme)
|
||||
@@ -43,14 +47,35 @@
|
||||
return new QImage(cachedFile.name());
|
||||
else
|
||||
{
|
||||
- QImage *i = new QImage(file);
|
||||
+ QImage *i;
|
||||
+ if (file.endsWith(".svg") || file.endsWith(".svgz")) {
|
||||
+#ifdef HAVE_LIBART
|
||||
+ KSVGIconEngine* svgEngine = new KSVGIconEngine();
|
||||
+ QSize size = mScaler->targetResolution();
|
||||
+ if (svgEngine->load(size.width(), size.height(), file )) {
|
||||
+ QImage *image = svgEngine->image();
|
||||
+ i = new QImage(*image);
|
||||
+ delete image;
|
||||
+ i->save(cachedFile.name(), QImage::imageFormat(file));
|
||||
+ } else {
|
||||
+ kdWarning() << "failed to load SVG file " << file << endl;
|
||||
+ }
|
||||
+ delete svgEngine;
|
||||
+#else
|
||||
+ kdWarning() << k_funcinfo
|
||||
+ << "tried to load SVG file but libart not installed" << endl;
|
||||
+#endif
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ i = new QImage(file);
|
||||
|
||||
// update cache if image needs to be scaled (base != target)
|
||||
if (mScaler->scaleSize(i))
|
||||
i->save(cachedFile.name(), QImage::imageFormat(file));
|
||||
|
||||
+ }
|
||||
writeInfoFile(parts.last());
|
||||
-
|
||||
return i;
|
||||
}
|
||||
}
|
||||
--- moodin/configure.in.in-- 2007-01-26 17:14:07.000000000 +0100
|
||||
+++ moodin/configure.in.in 2007-01-26 17:14:24.000000000 +0100
|
||||
@@ -4,3 +4,35 @@
|
||||
AC_C_BIGENDIAN
|
||||
AC_CHECK_KDEMAXPATHLEN
|
||||
|
||||
+dnl libart is used by svg background
|
||||
+KDE_FIND_PATH(libart2-config, LIBART_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin], [
|
||||
+ AC_MSG_WARN([Could not find libart anywhere, check http://www.levien.com/libart/])
|
||||
+])
|
||||
+
|
||||
+if test -n "$LIBART_CONFIG"; then
|
||||
+ vers=`$LIBART_CONFIG --version 2>/dev/null | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
|
||||
+ if test -n "$vers" && test "$vers" -ge 2003008
|
||||
+ then
|
||||
+ LIBART_LIBS="`$LIBART_CONFIG --libs`"
|
||||
+ LIBART_RPATH=
|
||||
+ for args in $LIBART_LIBS; do
|
||||
+ case $args in
|
||||
+ -L*)
|
||||
+ LIBART_RPATH="$LIBART_RPATH $args"
|
||||
+ ;;
|
||||
+ esac
|
||||
+ done
|
||||
+ LIBART_RPATH=`echo $LIBART_RPATH | sed -e "s/-L/-R/g"`
|
||||
+ LIBART_CFLAGS="`$LIBART_CONFIG --cflags`"
|
||||
+
|
||||
+ AC_DEFINE_UNQUOTED(HAVE_LIBART, 1, [Defines if your system has the libart library])
|
||||
+ else
|
||||
+ AC_MSG_WARN([You need at least libart 2.3.8])
|
||||
+ fi
|
||||
+fi
|
||||
+
|
||||
+
|
||||
+AC_SUBST(LIBART_LIBS)
|
||||
+AC_SUBST(LIBART_CFLAGS)
|
||||
+AC_SUBST(LIBART_RPATH)
|
||||
+
|
||||
Binary file not shown.
Binary file not shown.
@ -1,75 +0,0 @@
|
||||
|
||||
Summary: Window Decoration for KDE3
|
||||
Name: kde3-kwinstyle-Hypnotista_Sade
|
||||
Version: 0.1
|
||||
Release: %mkrel 3
|
||||
URL: http://kde-look.org/content/show.php/Hypnotista+Sade?content=32946
|
||||
Source0: http://kde-look.org/CONTENT/content-files/Hypnotista_Sade-%{version}.tar.gz
|
||||
Patch0: fix_autotools.patch
|
||||
Group: Graphical desktop/KDE3
|
||||
License: GPL
|
||||
BuildRoot: %{_tmppath}/%{name}-root
|
||||
BuildRequires: kde3-macros
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
%else
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
%endif
|
||||
BuildRequires: automake >= 1.6
|
||||
BuildRequires: %{_lib}xorg-x11-devel
|
||||
BuildRequires: kdelibs-devel
|
||||
BuildRequires: kdebase-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: qt3-devel
|
||||
Requires: kdelibs >= 3.5.9
|
||||
Requires: kdebase >= 3.5.9
|
||||
|
||||
%description
|
||||
Window Decoration inspired of windows vista visual style for KDE3
|
||||
|
||||
%prep
|
||||
%setup -q -n Hypnotista_Sade-%{version}
|
||||
%if %mdkversion >= 201000
|
||||
%patch0 -p1
|
||||
%endif
|
||||
|
||||
|
||||
%build
|
||||
export QTDIR=%qt3dir
|
||||
|
||||
make -f Makefile.cvs
|
||||
%configure_kde3
|
||||
|
||||
%make
|
||||
|
||||
%install
|
||||
rm -rf %buildroot
|
||||
%makeinstall_std
|
||||
|
||||
%clean
|
||||
rm -rf %buildroot
|
||||
|
||||
%if %mdkversion < 2009000
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%_kde3_appsdir/kwin/*.desktop
|
||||
%_kde3_libdir/kde3/*.la
|
||||
%_kde3_libdir/kde3/*.so
|
||||
|
||||
%changelog
|
||||
* Mon Jul 18 2011 Tim Willials <tim@my-place.org.uk> 0.1-3mvt2010.2
|
||||
+ rebuild for Trinity
|
||||
|
||||
* Sat May 08 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.1-2mvt2010.0
|
||||
- fix buildrequires
|
||||
|
||||
* Sun Feb 21 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.1-1mvt2010.0
|
||||
+ Packaged for mdv 2010.0
|
||||
- Patch to compile with autoconf 2.65 and automake 1.11
|
||||
@ -1,76 +0,0 @@
|
||||
|
||||
Summary: Hypnotista_Siyah Window Decoration for KDE3
|
||||
Name: kde3-kwinstyle-Hypnotista_Siyah
|
||||
Version: 0.1
|
||||
Release: %mkrel 3
|
||||
URL: http://www.kde-look.org/content/show.php?content=33203
|
||||
Source0: http://www.kde-look.org/CONTENT/content-files/33203-Hypnotista_Siyah-%{version}.tar.gz
|
||||
Patch0: fix_autotools.patch
|
||||
Group: Graphical desktop/KDE3
|
||||
License: GPL
|
||||
BuildRoot: %{_tmppath}/%{name}-root
|
||||
BuildRequires: kde3-macros
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
%else
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
%endif
|
||||
BuildRequires: automake >= 1.6
|
||||
BuildRequires: %{_lib}xorg-x11-devel
|
||||
BuildRequires: kdelibs-devel
|
||||
BuildRequires: kdebase-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: qt3-devel
|
||||
Requires: kdelibs >= 3.5.9
|
||||
Requires: kdebase >= 3.5.9
|
||||
|
||||
%description
|
||||
Window Decoration inspired of windows vista visual style for KDE3
|
||||
This decoration is black version of Hypnotista Sade.
|
||||
|
||||
%prep
|
||||
%setup -q -n Hypnotista_Siyah-%{version}
|
||||
%if %mdkversion >= 201000
|
||||
%patch0 -p1
|
||||
%endif
|
||||
|
||||
|
||||
%build
|
||||
export QTDIR=%qt3dir
|
||||
|
||||
make -f Makefile.cvs
|
||||
%configure_kde3
|
||||
|
||||
%make
|
||||
|
||||
%install
|
||||
rm -rf %buildroot
|
||||
%makeinstall_std
|
||||
|
||||
%clean
|
||||
rm -rf %buildroot
|
||||
|
||||
%if %mdkversion < 2009000
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%_kde3_appsdir/kwin/*.desktop
|
||||
%_kde3_libdir/kde3/*.la
|
||||
%_kde3_libdir/kde3/*.so
|
||||
|
||||
%changelog
|
||||
* Fri Jul 22 2011 Tim Williams <tim@my-place.org.uk> 0.1-3mvt2010.2
|
||||
- Rebuild for Trinity
|
||||
|
||||
* Sat May 08 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.1-2mvt2010.0
|
||||
- fix buildrequires
|
||||
|
||||
* Sun Feb 21 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.1-1mvt2010.0
|
||||
+ Packaged for mdv 2010.0
|
||||
- Patch to compile with autoconf 2.65 and automake 1.11
|
||||
@ -1,74 +0,0 @@
|
||||
%define oname deKorator
|
||||
Name: kde3-kwinstyle-%{oname}
|
||||
Version: 0.3
|
||||
Release: %mkrel 3
|
||||
Source: %{oname}-%{version}.tar.bz2
|
||||
Patch0: fix_autotools.patch
|
||||
Patch1: kde-3.5.10-acinclude.patch
|
||||
Summary: KDE3 Window Decoration Generator
|
||||
URL: http://kde-look.org/content/show.php/deKorator?content=31447
|
||||
License: GPL
|
||||
Group: Graphical desktop/KDE3
|
||||
BuildRequires: kde3-macros
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
%else
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
%endif
|
||||
BuildRequires: automake >= 1.6
|
||||
BuildRequires: %{_lib}xorg-x11-devel
|
||||
BuildRequires: kdelibs-devel
|
||||
BuildRequires: kdebase-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: qt3-devel
|
||||
Requires: kdelibs >= 3.5.9
|
||||
Requires: kdebase >= 3.5.9
|
||||
BuildRoot: %{_tmppath}/%{name}-root
|
||||
|
||||
%description
|
||||
Design your own window decorations with
|
||||
deKorator!
|
||||
|
||||
%prep
|
||||
%setup -q -n %{oname}-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
|
||||
make -f admin/Makefile.common
|
||||
%configure_kde3
|
||||
%make
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
%makeinstall_std
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%if %mdkversion < 2009000
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%_kde3_appsdir/kwin/%{oname}.desktop
|
||||
%_kde3_libdir/*
|
||||
%changelog
|
||||
* Mon Jul 18 2011 Tim Williams <tim@my-place.org.uk> 0.3-3mvt2010.2
|
||||
+ rebuild for Trinity
|
||||
|
||||
* Sat May 08 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.3-2mvt2010.0
|
||||
- fix buildrequires
|
||||
|
||||
* Tue Apr 20 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.3-1mvt2010.0
|
||||
+ Package for 2010.0 release
|
||||
@ -1,79 +0,0 @@
|
||||
%define oname mplayerthumbs
|
||||
|
||||
|
||||
Name: kde3-%{oname}
|
||||
Version: 0.5b
|
||||
Release: %mkrel 3
|
||||
Summary: Thumbnail Generator for Video Files in KDE3 Konqueror, using MPlayer
|
||||
Source0: http://xoomer.alice.it/rockman81/mplayerthumbs-%{version}.tar.bz2
|
||||
Source1: sprocket1-large.png
|
||||
Source2: sprocket1-medium.png
|
||||
Source3: sprocket1-small.png
|
||||
Patch0: mplayerthumbs-0.5b-gcc-4.3.patch
|
||||
Patch1: make_preview_horizontal.patch
|
||||
URL: http://kde-apps.org/content/show.php?content=41180
|
||||
Group: Graphical desktop/KDE3
|
||||
License: GPL
|
||||
BuildRoot: %{_tmppath}/%{oname}-buildroot
|
||||
Requires: mplayer
|
||||
BuildRequires: kde3-macros
|
||||
BuildRequires: kdelibs3-devel
|
||||
BuildRequires: libstdc++-devel
|
||||
|
||||
|
||||
%description
|
||||
%{oname} is a thumbnail generator for video files on KDE3 Konqueror.
|
||||
Unlike the original konqueror plugin, it does not depend neither on xine nor
|
||||
arts, instead it uses only mplayer.
|
||||
You can take advantage of this on x86_64 systems, where you can use a 32bit
|
||||
mplayer to load win32codecs. To configure the location of your mplayer binary
|
||||
launch mplayerthumbsconfig.
|
||||
Also it's faster than the xine plugin, since it can seek and play only a
|
||||
limited number of frames.
|
||||
It catches a random frame from 15% to 70%, checking also how contrasted is the
|
||||
image, and dropping bad frames.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{oname}-%{version}
|
||||
%patch0 -p0
|
||||
%patch1 -p1
|
||||
rm -rf src/sprocket*
|
||||
cp -R %{SOURCE1} src
|
||||
cp -R %{SOURCE2} src
|
||||
cp -R %{SOURCE3} src
|
||||
|
||||
%build
|
||||
|
||||
%configure_kde3
|
||||
|
||||
%make
|
||||
|
||||
%install
|
||||
%makeinstall_std
|
||||
%find_lang videopreview && %__mv videopreview.lang %{oname}.lang
|
||||
|
||||
%clean
|
||||
%__rm -rf %{buildroot}
|
||||
|
||||
%files -f %{oname}.lang
|
||||
%defattr(-,root,root)
|
||||
%doc AUTHORS ChangeLog COPYING NEWS README TODO
|
||||
%_kde3_bindir/mplayerthumbsconfig
|
||||
%_kde3_libdir/kde3/videopreview.so
|
||||
%_kde3_libdir/kde3/videopreview.la
|
||||
%_kde3_appsdir/videothumbnail
|
||||
%_kde3_datadir/config.kcfg/mplayerthumbs.kcfg
|
||||
%_kde3_datadir/services/videopreview.desktop
|
||||
%_kde3_docdir/*
|
||||
|
||||
%changelog
|
||||
* Fri Jul 22 2011 Tim Williams <tim@my-place.org.uk> 0.5b-2mvt2010.2
|
||||
- Build for Trinity
|
||||
|
||||
* Fri Jul 23 2010 Tim Williams <tim@my-place.org.uk> 0.5b-2mvt2010.1
|
||||
- Build for MDV 2010.1
|
||||
|
||||
* Thu Dec 24 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.5b-1mvt2010.0
|
||||
- Built for 2010.0
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
diff -Naur mplayerthumbs-0.5b/src/Makefile.am mplayerthumbs-0.5b-yeni/src/Makefile.am
|
||||
--- mplayerthumbs-0.5b/src/Makefile.am 2006-06-29 11:48:04.000000000 +0300
|
||||
+++ mplayerthumbs-0.5b-yeni/src/Makefile.am 2010-01-02 03:15:07.000000000 +0200
|
||||
@@ -16,7 +16,7 @@
|
||||
protocol_DATA = videopreview.desktop
|
||||
videopreview_la_LIBADD = $(LIB_KDECORE)
|
||||
|
||||
-videothumbnail_DATA = sprocket-small.png sprocket-medium.png sprocket-large.png
|
||||
+videothumbnail_DATA = sprocket1-small.png sprocket1-medium.png sprocket1-large.png
|
||||
videothumbnaildir = $(kde_datadir)/videothumbnail
|
||||
kde_kcfg_DATA = mplayerthumbs.kcfg
|
||||
|
||||
diff -Naur mplayerthumbs-0.5b/src/Makefile.in mplayerthumbs-0.5b-yeni/src/Makefile.in
|
||||
--- mplayerthumbs-0.5b/src/Makefile.in 2006-07-10 18:24:13.000000000 +0300
|
||||
+++ mplayerthumbs-0.5b-yeni/src/Makefile.in 2010-01-02 03:16:02.000000000 +0200
|
||||
@@ -364,7 +364,7 @@
|
||||
protocoldir = $(kde_servicesdir)
|
||||
protocol_DATA = videopreview.desktop
|
||||
videopreview_la_LIBADD = $(LIB_KDECORE)
|
||||
-videothumbnail_DATA = sprocket-small.png sprocket-medium.png sprocket-large.png
|
||||
+videothumbnail_DATA = sprocket1-small.png sprocket1-medium.png sprocket1-large.png
|
||||
videothumbnaildir = $(kde_datadir)/videothumbnail
|
||||
kde_kcfg_DATA = mplayerthumbs.kcfg
|
||||
#>- all: all-recursive
|
||||
@@ -858,7 +858,7 @@
|
||||
-rm -f videopreview.moc
|
||||
|
||||
#>+ 2
|
||||
-KDE_DIST=videopreview.desktop Makefile.in sprocket-medium.png sprocket-small.png videopreview.h mplayerthumbs.kcfgc sprocket-large.png mplayerthumbs.kcfg videopreview.lsm Makefile.am
|
||||
+KDE_DIST=videopreview.desktop Makefile.in sprocket1-medium.png sprocket1-small.png videopreview.h mplayerthumbs.kcfgc sprocket1-large.png mplayerthumbs.kcfg videopreview.lsm Makefile.am
|
||||
|
||||
#>+ 4
|
||||
clean-kcfg:
|
||||
diff -Naur mplayerthumbs-0.5b/src/videopreview.cpp mplayerthumbs-0.5b-yeni/src/videopreview.cpp
|
||||
--- mplayerthumbs-0.5b/src/videopreview.cpp 2006-07-10 18:17:11.000000000 +0300
|
||||
+++ mplayerthumbs-0.5b-yeni/src/videopreview.cpp 2010-01-02 03:14:03.000000000 +0200
|
||||
@@ -160,14 +161,15 @@
|
||||
QPixmap sprocket;
|
||||
|
||||
if (pix.height() < 60)
|
||||
- sprocket = QPixmap(locate( "data", "videothumbnail/sprocket-small.png" ));
|
||||
+ sprocket = QPixmap(locate( "data", "videothumbnail/sprocket1-small.png" ));
|
||||
else if (pix.height() < 90)
|
||||
- sprocket = QPixmap(locate( "data", "videothumbnail/sprocket-medium.png" ));
|
||||
+ sprocket = QPixmap(locate( "data", "videothumbnail/sprocket1-medium.png" ));
|
||||
else
|
||||
- sprocket = QPixmap(locate( "data", "videothumbnail/sprocket-large.png" ));
|
||||
+ sprocket = QPixmap(locate( "data", "videothumbnail/sprocket1-large.png" ));
|
||||
|
||||
- for (int y = 0; y < pix.height() + sprocket.height(); y += sprocket.height()) {
|
||||
- painter.drawPixmap( 0, y, sprocket );
|
||||
+ for (int x = 0; x < pix.width() + sprocket.width(); x += sprocket.width()) {
|
||||
+ painter.drawPixmap( x, 0, sprocket );
|
||||
+ painter.drawPixmap( x, (pix.height() - sprocket.height()), sprocket );
|
||||
}
|
||||
|
||||
// End of xine-artsplugin code
|
||||
@ -1,12 +0,0 @@
|
||||
*** src/videopreview.cpp.orig 2006-07-10 17:17:11.000000000 +0200
|
||||
--- src/videopreview.cpp 2008-06-11 02:45:40.379823160 +0200
|
||||
***************
|
||||
*** 20,25 ****
|
||||
--- 20,26 ----
|
||||
|
||||
#include "videopreview.h"
|
||||
|
||||
+ #include <stdlib.h>
|
||||
#include <qfile.h>
|
||||
#include <qpixmap.h>
|
||||
#include <qimage.h>
|
||||
|
Before Width: | Height: | Size: 687 B |
|
Before Width: | Height: | Size: 384 B |
|
Before Width: | Height: | Size: 246 B |
@ -1,57 +0,0 @@
|
||||
diff -Naur usr/bin/mountiso.sh usr.yedek/bin/mountiso.sh
|
||||
--- usr/bin/mountiso.sh 2008-03-22 18:39:29.000000000 +0200
|
||||
+++ usr.yedek/bin/mountiso.sh 2009-11-21 16:29:27.000000000 +0200
|
||||
@@ -1,11 +1,23 @@
|
||||
#!/bin/sh
|
||||
# Mount-ISO v0.9.5
|
||||
+# Define NEWLINE as the delimiter...
|
||||
+IFS='
|
||||
+
|
||||
+';
|
||||
+
|
||||
+
|
||||
+
|
||||
BSNAME="`basename "$1"`"
|
||||
+if [ -f /opt/kde3/bin/kdesu ]; then
|
||||
+ kdesu="/opt/kde3/bin/kdesu"
|
||||
+else
|
||||
+ kdesu="/usr/bin/kdesu"
|
||||
+fi
|
||||
|
||||
if ( `echo "$BSNAME" | grep "Mount-ISO" > /dev/null` ) then
|
||||
MOUNTDIR="$1"
|
||||
else
|
||||
- MOUNTDIR="$HOME/Desktop/Mount-ISO ($BSNAME)"
|
||||
+ MOUNTDIR="$HOME/Mount-ISO ($BSNAME)"
|
||||
fi
|
||||
|
||||
function dialog {
|
||||
@@ -129,8 +141,8 @@
|
||||
}
|
||||
|
||||
function check_mount {
|
||||
- DEV="`mount | grep "$1" | cut -f 1 -d " "`"
|
||||
- if ( test ! -z "$DEV" ) then
|
||||
+ DEV="`mount | grep "$1" | cut -f 1 -d ' '`"
|
||||
+ if ( test ! -z \"$DEV\" ) then
|
||||
return 0
|
||||
else
|
||||
return 1
|
||||
@@ -208,7 +220,7 @@
|
||||
err 7 "$1"
|
||||
;;
|
||||
esac
|
||||
- kdesu -c "mount -t udf,iso9660 -o loop,ro,nodev,noexec,nosuid${MODE} \"${1}\" \"$MOUNTDIR\""
|
||||
+ $kdesu -c "mount -t udf,iso9660 -o loop,ro,nodev,noexec,nosuid${MODE} \"${1}\" \"$MOUNTDIR\""
|
||||
fi
|
||||
if ( check_mount "$MOUNTDIR" ) then
|
||||
kfmclient openURL "$MOUNTDIR" && note 1
|
||||
@@ -221,7 +233,7 @@
|
||||
if (test ! -d "$MOUNTDIR") then
|
||||
err 4 "$1"
|
||||
elif (check_mount "$MOUNTDIR") then
|
||||
- kdesu -c "umount \"$MOUNTDIR\"" &&
|
||||
+ $kdesu -c "umount \"$MOUNTDIR\"" &&
|
||||
rmdir "$MOUNTDIR" && note 2 ||
|
||||
err 13 "$1"
|
||||
if ( test "${DEV##/dev/cdemu/}" -ge 0 2>/dev/null ) then
|
||||
@ -1,86 +0,0 @@
|
||||
%define name kde3-servicemenu-mountiso
|
||||
%define origname mountiso
|
||||
%define version 0.9.5
|
||||
%define release %mkrel 3
|
||||
%define group Graphical desktop/KDE
|
||||
%define arch noarch
|
||||
%define distro %(rpm -qf --qf='%{VERSION}' /etc/mandrake-release)
|
||||
|
||||
|
||||
Name: %{name}
|
||||
Version: %{version}
|
||||
Release: %{release}
|
||||
License: GPL
|
||||
Group: %{group}
|
||||
Summary: MountISO - ISO Imager Mounter
|
||||
Source0: %{origname}-%{version}.tar.bz2
|
||||
Patch0: fix_weird_iso_names.patch
|
||||
Url: http://www.kde-apps.org/content/show.php/MountISO?content=11577
|
||||
BuildRoot: %{_tmppath}/%{origname}-%{version}-buildroot
|
||||
BuildArch: %{arch}
|
||||
#Conflicts:
|
||||
Obsoletes: %{origname}
|
||||
#BuildRequires:
|
||||
Requires: kdebase
|
||||
Suggests: ccd2iso cdemu extract-xiso bchunk mdf2iso
|
||||
|
||||
|
||||
%description
|
||||
Mount ISO Image is an advanced script which allows to perform multiple operations with ISO, NRG (Nero Burning ROM), UDF (DVD), CUE/BIN, CCD/IMG/SUB (CloneCD), XDVDFS (XBOX) and MDF images.
|
||||
|
||||
Optionally can be installed the packages “ccd2iso, cdemu and extract-xiso”.
|
||||
|
||||
Translations
|
||||
------------
|
||||
- German (by Markus Bloch)
|
||||
- Italian (by marcosegato)
|
||||
- Russian (by Jinjiru)
|
||||
- Serbian (by Mladen Pejaković)
|
||||
- Spanish (by Javier Ariza Rodríguez & Alberto Garcia)
|
||||
- Turkish (by Atilla Öntaş)
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n usr
|
||||
%patch0 -p1
|
||||
%build
|
||||
|
||||
%install
|
||||
rm -rf %buildroot
|
||||
mkdir -p %{buildroot}%_kde3_datadir
|
||||
mkdir -p %{buildroot}%_kde3_bindir
|
||||
cp -R bin/* %{buildroot}%_kde3_bindir/
|
||||
cp -R share/* %{buildroot}%_kde3_datadir/
|
||||
#remove x-cue.desktop. Conflicts with kdelibs3-common-30000000:3.5.10-12mvt2010.0.x86_64
|
||||
pushd %buildroot/%_kde3_datadir/
|
||||
rm -rf mimelnk/application/x-cue.desktop
|
||||
popd
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%_kde3_bindir/*
|
||||
%_kde3_appsdir/konqueror/servicemenus/*.desktop
|
||||
%_kde3_appsdir/d3lphin/servicemenus/*.desktop
|
||||
%_kde3_datadir/mimelnk/application/*.desktop
|
||||
|
||||
%changelog
|
||||
* Fri Jul 22 2011 Tim Williams <tim@my-place.org.uk> 0.9.5-3mvt2010.2
|
||||
- Built for Trinity KDE
|
||||
|
||||
* Mon Jul 19 2010 Tim Williams <tim@my-place.org.uk> 0.9.5-2mvt2010.0
|
||||
- Built for MDV 2010.1
|
||||
|
||||
* Sat Nov 21 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.9.5-1mvt2010.0
|
||||
-Packaged for 2010.0
|
||||
|
||||
* Sat Mar 22 2008 maik3531 <maik3531@web.de> 0.9.5-1pclos2007
|
||||
- rebuild to PCLinuxOS
|
||||
- provide a new Source0
|
||||
- add description -l de & summary de
|
||||
|
||||
* Fri Mar 21 2008 Erkan Kaplan <erkan@linux-sevenler.org>
|
||||
- First build
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
|
||||
Name: kde3-servicemenu-rootactions
|
||||
Summary: Root actions for D3lphin/Konqueror context menu
|
||||
Version: 2.4.7.1
|
||||
Release: %mkrel 3
|
||||
Url: http://www.kde-apps.org/content/show.php/Root+Actions+Servicemenu?content=48411
|
||||
Group: Graphical desktop/KDE
|
||||
License: GPL-2
|
||||
Source0: 48411-rootactions_servicemenu_2.4.7.1.tar.gz
|
||||
BuildArch: noarch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
|
||||
Requires: kdebase-progs
|
||||
|
||||
%description
|
||||
Root Actions servicemenu provides a convenient way to perform several actions 'as root', from the right-click context menu in KDE filemanager.
|
||||
|
||||
%prep
|
||||
rm -rf %{buildroot}
|
||||
%setup -q -n rootactions_servicemenu_2.4.7
|
||||
#We are building this ackage for KDE3. Remove unneeded KDE4 parts
|
||||
rm -rf Root_Actions_2.4.7/*-KDE4
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}%_kde3_bindir
|
||||
cp Root_Actions_2.4.7/rootactions-servicemenu.pl %{buildroot}%_kde3_bindir
|
||||
|
||||
mkdir -p %{buildroot}%_kde3_appsdir/dolphin/servicemenus
|
||||
cp Root_Actions_2.4.7/dolphin-KDE3/*.desktop %{buildroot}%_kde3_appsdir/dolphin/servicemenus
|
||||
|
||||
mkdir -p %{buildroot}%_kde3_appsdir/konqueror/servicemenus
|
||||
cp Root_Actions_2.4.7/konqueror-KDE3/*.desktop %{buildroot}%_kde3_appsdir/konqueror/servicemenus
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%files
|
||||
%defattr(0755,root,root)
|
||||
%doc changelog GPL-2
|
||||
%attr(755,root,root) %_kde3_bindir/rootactions-servicemenu.pl
|
||||
%_kde3_appsdir/*
|
||||
|
||||
%changelog
|
||||
* Mon Jul 18 2011 Tim Williams <tim@my-place.org.uk> 2.4.7.1-3mvt2010.1
|
||||
- Rebuilt for Trinity
|
||||
|
||||
* Mon Jul 19 2010 Tim Williams <tim@my-place.org.uk> 2.4.7.1-2mvt2010.1
|
||||
- Rebuilt for MDV 2010.1
|
||||
|
||||
* Mon Nov 23 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2.4.7.1-1mvt2010.0
|
||||
- Packaged for KDE3 Mandriva 2010.0
|
||||
@ -1,214 +0,0 @@
|
||||
%define shortname ia_ora-kde
|
||||
Summary: Mandriva theme for KDE - Widget design
|
||||
Name: kde3-style-ia-ora
|
||||
Version: 1.0.8
|
||||
Release: %mkrel 10
|
||||
License: GPL
|
||||
Group: Graphical desktop/KDE3
|
||||
URL: http://www.mandrivalinux.com/
|
||||
BuildRequires: kdelibs-devel
|
||||
BuildRequires: kdebase-devel >= 3.1.94-11mdk
|
||||
Source0: %{shortname}-%{version}.tar.bz2
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
|
||||
%description
|
||||
Mandriva theme for KDE
|
||||
|
||||
%prep
|
||||
%setup -q -n %{shortname}-%{version}
|
||||
|
||||
%build
|
||||
%configure_kde3
|
||||
|
||||
%make
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%makeinstall_std
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%_kde3_libdir/kde3/kwin3_iaora.la
|
||||
%_kde3_libdir/kde3/kwin3_iaora.so
|
||||
%_kde3_libdir/kde3/kwin_iaora_config.la
|
||||
%_kde3_libdir/kde3/kwin_iaora_config.so
|
||||
%_kde3_appsdir/kwin/iaora.desktop
|
||||
%_kde3_libdir/kde3/plugins/styles/ia_ora.la
|
||||
%_kde3_libdir/kde3/plugins/styles/ia_ora.so
|
||||
%_kde3_appsdir/kstyle/themes/ia_ora.themerc
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 22 2011 Tim Williams <tim@my-place.org.uk> 1.0.8-10mvt2010.2
|
||||
+ Rebuild for Trinity
|
||||
|
||||
* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 1.0.8-9mvt2010.0
|
||||
+ Rebuild for MDV 2010.1
|
||||
|
||||
* Sun Nov 22 2009 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 1.0.8-8mvt2010.0
|
||||
- Rename package to avoid unwanted KDE4 upgrade
|
||||
- Merge packages in one kde-style package
|
||||
- Fix package group in spec file
|
||||
|
||||
* Tue Nov 17 2009 Tim Williams <tim@my-place.org.uk> 1.0.8-7mdv2010.0
|
||||
+ Rebuild for MDV 2010.0
|
||||
|
||||
* Thu Mar 26 2009 Helio Chissini de Castro <helio@mandriva.com> 1.0.8-6mdv2009.1
|
||||
+ Revision: 361404
|
||||
- Bump to rebuild against cooker
|
||||
|
||||
* Tue Nov 18 2008 Thierry Vignaud <tvignaud@mandriva.com> 1.0.8-5mdv2009.1
|
||||
+ Revision: 304189
|
||||
- rebuild for new xcb
|
||||
|
||||
* Wed Aug 06 2008 Thierry Vignaud <tvignaud@mandriva.com> 1.0.8-4mdv2009.0
|
||||
+ Revision: 264680
|
||||
- rebuild early 2009.0 package (before pixel changes)
|
||||
|
||||
* Thu May 08 2008 Helio Chissini de Castro <helio@mandriva.com> 1.0.8-2mdv2009.0
|
||||
+ Revision: 204689
|
||||
- Move to /opt
|
||||
|
||||
* Wed Feb 27 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 1.0.8-1mdv2008.1
|
||||
+ Revision: 175799
|
||||
- New release (1.0.8):
|
||||
* Fix drawing of buttons when using mandriva color schemes
|
||||
* Update color scheme names to match the new ones
|
||||
|
||||
* Tue Feb 19 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 1.0.7-1mdv2008.1
|
||||
+ Revision: 173100
|
||||
- new release (1.0.7) fixing some drawing issues on applications that don't use
|
||||
standard background colors (#33502)
|
||||
|
||||
* Thu Jan 03 2008 Oden Eriksson <oeriksson@mandriva.com> 1.0.6-2mdv2008.1
|
||||
+ Revision: 141786
|
||||
- rebuilt against openldap-2.4.7 libs
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
|
||||
* Wed Sep 12 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1.0.6-1mdv2008.0
|
||||
+ Revision: 84626
|
||||
- new release: 1.0.6:
|
||||
* Use the right color for the bottom line of menubar
|
||||
* Remove some lines that were causing double borders at menubar and toolbar
|
||||
ends
|
||||
* Fix the bottom of toolbars: it was being drawn using the wrong color
|
||||
* Use a flat background for status bars
|
||||
* Add a minimum size for the scrollbar handle
|
||||
- new release: 1.0.5
|
||||
* Use the widget style in all separators (#33260)
|
||||
* Fixed popup menu item drawing on menus that have titles (#33287)
|
||||
|
||||
* Thu Sep 06 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1.0.4-1mdv2008.0
|
||||
+ Revision: 81272
|
||||
- new version: 1.0.4
|
||||
* Restore the old color themes (as they will be kept as alternatives)
|
||||
* Properly mask the rounded borders and properly draw the region previously
|
||||
masked
|
||||
* Create fake rounded corners on menu items
|
||||
* Reduced the button margin to get normal sized buttons (not giant ones)
|
||||
* Make it possible to resize windows by the top border
|
||||
------------------------------------------------------------------------
|
||||
r227235 | boiko | 2007-09-06 13:58:18 -0300 (Qui, 06 Set 2007) | 3 lines
|
||||
|
||||
* Wed Sep 05 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1.0.3-1mdv2008.0
|
||||
+ Revision: 80378
|
||||
- new release: 1.0.3
|
||||
* Implement highligh on hovering controls
|
||||
* Threat scrollbar buttons as buttons (showing them lowered when the button
|
||||
is pressed for example)
|
||||
* Show the combo box button as pressed when the list is opened
|
||||
* Removed Powerpack+ colors
|
||||
* Changed Discovery/One to just One and adjusted colors
|
||||
* Used more sane values when using ia_ora together with other KDE color
|
||||
schemes
|
||||
- new release:
|
||||
* fix gradient colors of menus (thanks Frederic Crozat for pointing that)
|
||||
* implement correctly the combo box drawing according to the ia_ora spec
|
||||
* Fix the text color of menubar items
|
||||
|
||||
* Thu Aug 23 2007 Gustavo Pichorim Boiko <boiko@mandriva.com> 1.0.1-1mdv2008.0
|
||||
+ Revision: 70685
|
||||
- new version: 1.0.1
|
||||
* Replace the gradient code by the Plastik one (it is better written)
|
||||
* Fix drawing of menubar items and popupmenu items (#30659)
|
||||
|
||||
* Mon Jun 11 2007 Nicolas Lécureuil <neoclust@mandriva.org> 1.0-18mdv2008.0
|
||||
+ Revision: 38004
|
||||
- REBUILD
|
||||
|
||||
|
||||
* Thu Mar 22 2007 Laurent Montel <lmontel@mandriva.com> 1.0-17mdv2007.1
|
||||
+ Revision: 147929
|
||||
- Fix theme
|
||||
|
||||
* Mon Mar 19 2007 Laurent Montel <lmontel@mandriva.com> 1.0-16mdv2007.1
|
||||
+ Revision: 146479
|
||||
- Fix progressbar text color
|
||||
|
||||
* Wed Mar 07 2007 Laurent Montel <lmontel@mandriva.com> 1.0-15mdv2007.1
|
||||
+ Revision: 134563
|
||||
- Fix style
|
||||
|
||||
* Tue Mar 06 2007 Laurent Montel <lmontel@mandriva.com> 1.0-14mdv2007.1
|
||||
+ Revision: 133854
|
||||
- New update
|
||||
|
||||
* Wed Feb 28 2007 Laurent Montel <lmontel@mandriva.com> 1.0-13mdv2007.1
|
||||
+ Revision: 127097
|
||||
- New update
|
||||
|
||||
* Wed Jan 24 2007 Laurent Montel <lmontel@mandriva.com> 1.0-12mdv2007.1
|
||||
+ Revision: 112737
|
||||
- Fix theme
|
||||
|
||||
* Tue Jan 02 2007 Laurent Montel <lmontel@mandriva.com> 1.0-11mdv2007.1
|
||||
+ Revision: 103350
|
||||
- Update tarball
|
||||
|
||||
* Mon Dec 11 2006 Laurent Montel <lmontel@mandriva.com> 1.0-10mdv2007.1
|
||||
+ Revision: 94696
|
||||
- Rename spec file name too
|
||||
- Rename ia_ora to ia_ora-kde
|
||||
Fix a lot of bug
|
||||
- Import ia_ora-kde
|
||||
|
||||
* Sat Sep 16 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-9
|
||||
- Fix title bar
|
||||
|
||||
* Thu Sep 14 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-8
|
||||
- Fix handle
|
||||
|
||||
* Thu Sep 14 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-7
|
||||
- Fix toolbar color
|
||||
|
||||
* Thu Sep 14 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-6
|
||||
- Fix Combobox/Scrollbar/Checkbox and bidi mode
|
||||
|
||||
* Tue Sep 12 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-5
|
||||
- Fix tabbar
|
||||
|
||||
* Tue Sep 12 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-4
|
||||
- Fix scrollbar
|
||||
|
||||
* Sun Sep 10 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-3
|
||||
- Improve style
|
||||
|
||||
* Fri Sep 08 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-2
|
||||
- Some fixes
|
||||
|
||||
* Tue Sep 05 2006 Laurent MONTEL <lmontel@mandriva.com> 1.0-1
|
||||
- Initial package
|
||||
|
||||
@ -1,84 +0,0 @@
|
||||
%define oname wisdom
|
||||
Name: kde3-style-%{oname}
|
||||
Version: 0.5
|
||||
Release: %mkrel 3
|
||||
Source: http://kde-look.org/CONTENT/content-files/65140-%{oname}-%{version}.tar.bz2
|
||||
Patch0: fix_autotools.patch
|
||||
Patch1: kde-3.5.10-acinclude.patch
|
||||
Summary: KDE3 style based on Plastik and Serenity
|
||||
URL: http://kde-look.org/content/show.php/Wisdom?content=65140
|
||||
License: GPL
|
||||
Group: Graphical desktop/KDE3
|
||||
BuildRequires: kde3-macros
|
||||
%if %mdkversion < 201000
|
||||
BuildRequires: autoconf <= 1:2.63
|
||||
%else
|
||||
BuildRequires: autoconf >= 1:2.65
|
||||
%endif
|
||||
BuildRequires: automake >= 1.6
|
||||
BuildRequires: %{_lib}xorg-x11-devel
|
||||
BuildRequires: kdelibs-devel
|
||||
BuildRequires: kdebase-devel
|
||||
BuildRequires: libpng-devel
|
||||
BuildRequires: qt3-devel
|
||||
Requires: kdelibs >= 3.5.9
|
||||
Requires: kdebase >= 3.5.9
|
||||
BuildRoot: %{_tmppath}/%{name}-root
|
||||
|
||||
%description
|
||||
Wisdom is a style for KDE 3.x based on Plastik and Serenity.
|
||||
|
||||
Here are the differences with Plastik:
|
||||
- Windows XP-like arrows.
|
||||
- Tree branches can be hidden.
|
||||
- The kicker panel draws its one-pixel border in black.
|
||||
- Panel 3D effects are lighter.
|
||||
- Popup menus border follows the color scheme.
|
||||
- Toolbar and menu separators are lighter.
|
||||
- Other horizontal and vertical separators are removed.
|
||||
- Group boxes are drawn in a Gnome-like look (i.e. without frame).
|
||||
- Tab height is fixed: two pixels were missing.
|
||||
- Focus is drawn with the highlight color. It is more discreet.
|
||||
- The kdm login manager can be transparent.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{oname}-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
|
||||
make -f admin/Makefile.common
|
||||
%configure_kde3
|
||||
%make
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
%makeinstall_std
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%if %mdkversion < 2009000
|
||||
%post
|
||||
/sbin/ldconfig
|
||||
|
||||
%postun
|
||||
/sbin/ldconfig
|
||||
%endif
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%_kde3_appsdir/kstyle/themes/*
|
||||
%_kde3_libdir/*
|
||||
|
||||
%changelog
|
||||
* Fri Jul 22 2011 Tim Williams <tim@my-place.org.uk> 0.5-3mvf2010.2
|
||||
- Rebuild for Trinity
|
||||
|
||||
* Sat May 08 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.5-2mvt2010.0
|
||||
- fix buildrequires
|
||||
|
||||
* Tue Apr 20 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 0.5-1mvt2010.0
|
||||
+ Package for 2010.0 release
|
||||
@ -1,316 +0,0 @@
|
||||
Name: task-kde3
|
||||
Version: 3.5.12
|
||||
Release: %mkrel 4
|
||||
Summary: Metapackage for KDE
|
||||
Group: Graphical desktop/KDE
|
||||
License: GPL
|
||||
Requires: %{name}-minimal
|
||||
Requires: kde3-kdepim-kontact
|
||||
Requires: kde3-kdeaddons-akregator
|
||||
Requires: kdeutils-kwalletmanager
|
||||
Requires: kdenetwork3-kopete
|
||||
Requires: aspell
|
||||
Requires: kdenetwork3-kget
|
||||
Suggests: kde3-amarok
|
||||
Suggests: kde3-kaffeine
|
||||
Suggests: kde3-k3b
|
||||
Suggests: kde3-konversation
|
||||
Suggests: kde3-kdegraphics
|
||||
Suggests: kde3-kdeaddons-metabar
|
||||
Suggests: kde3-kdeaddons-kfile-plugins
|
||||
Suggests: kde3-kdeaddons-kicker-applets
|
||||
Suggests: kde3-kdeaddons-konqimagegallery
|
||||
Suggests: kde3-kdeaddons-renamedlg
|
||||
Suggests: kde3-kdeaddons-kaddressbook-plugins
|
||||
Suggests: kde3-kdeaddons-knewsticker
|
||||
Suggests: kde3-kdeaddons-atlantik
|
||||
Suggests: kde3-kdeaddons-searchbar
|
||||
Suggests: kde3-kdegraphics-ksvg
|
||||
Suggests: kdeutils-kmilo
|
||||
Suggests: kde-config-file
|
||||
Suggests: kdeutils-ark
|
||||
|
||||
|
||||
BuildArch: noarch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
|
||||
%description
|
||||
This package is a meta-package, meaning that its purpose is to contain
|
||||
dependencies for running the K Desktop Environment.
|
||||
|
||||
%files
|
||||
%defattr(-,root,root-)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package devel
|
||||
Summary: Metapackage for KDE development
|
||||
Group: Development/KDE and Qt
|
||||
Requires: kdelibs3-devel
|
||||
Requires: libkde3core4-devel
|
||||
Requires: libcups-devel
|
||||
Requires: e2fsprogs-devel
|
||||
Requires: libltdl-devel
|
||||
Requires: libtiff-devel
|
||||
Requires: libxml2-devel
|
||||
Requires: libxslt-devel
|
||||
Requires: taglib-devel
|
||||
Requires: gcc-c++
|
||||
Requires: automake
|
||||
Requires: autoconf
|
||||
Requires: gettext
|
||||
|
||||
%description devel
|
||||
This package is a meta-package, meaning that its purpose is to contain
|
||||
dependencies for installing a KDE development environment.
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root-)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package minimal
|
||||
Summary: Metapackage for minimal KDE3
|
||||
Group: Graphical desktop/KDE
|
||||
Requires: arts3
|
||||
Requires: kde3-kdebase-progs
|
||||
Requires: kde3-style-ia-ora
|
||||
Requires: kde3-kdebase-kmenuedit
|
||||
Requires: krozat
|
||||
Requires: xsettings-kde
|
||||
Requires: kde3-kdebase-servicemenu
|
||||
Requires: kde3-kdeaddons-konq-plugins
|
||||
Requires: kde3-kdegraphics-common
|
||||
Requires: kde3-kdebase-konsole
|
||||
Requires: fonts-ttf-dejavu
|
||||
Requires: fonts-ttf-liberation
|
||||
Requires: kde3-kdebase-kdm
|
||||
Suggests: kde3-kdebase-nsplugins
|
||||
Suggests: preload
|
||||
Suggests: readahead
|
||||
Suggests: kde3-kdebase-kmenuedit
|
||||
Suggests: task-pulseaudio
|
||||
Suggests: kde3-kdemultimedia-kmix
|
||||
|
||||
|
||||
%description minimal
|
||||
This package is a meta-package, meaning that its purpose is to contain
|
||||
minimal dependencies for running the K Desktop Environment.
|
||||
|
||||
%files minimal
|
||||
%defattr(-,root,root-)
|
||||
|
||||
#--------------------------------------------------------------------
|
||||
|
||||
%package all
|
||||
Summary: Metapackage for all KDE3
|
||||
Group: Graphical desktop/KDE
|
||||
Requires: %{name}-minimal
|
||||
Requires: aspell
|
||||
#Requires: kde3-gwenview
|
||||
Requires: kde3-amarok
|
||||
Requires: kde3-kdebase-kmenuedit
|
||||
Requires: kde3-i18n-en_GB
|
||||
Requires: kde3-i18n-de
|
||||
Requires: kde3-i18n-fr
|
||||
Requires: kde3-i18n-es
|
||||
Requires: kde3-i18n-tr
|
||||
Requires: kde3-k3b
|
||||
Requires: kde3-kaffeine
|
||||
Requires: kde3-kdegraphics
|
||||
Requires: kde3-kdemultimedia
|
||||
Requires: kde3-kdemultimedia
|
||||
Requires: kdeutils
|
||||
Requires: kdenetwork3
|
||||
Requires: kde3-kdeaddons
|
||||
Requires: kde3-kdepim
|
||||
Requires: kde3-kdmtheme
|
||||
Requires: kde3-kickoff-i18n
|
||||
Requires: kde3-kio-sysinfo
|
||||
Requires: kdeartwork
|
||||
#Requires: kde-icons-tulliana
|
||||
Suggests: kde3-amarok-engine-xine
|
||||
Suggests: kde3-amarok-engine-yauap
|
||||
#Suggests: kde3-digikam
|
||||
Suggests: kde3-gtk-qt-engine
|
||||
Suggests: kde3-kicker-backgrounds
|
||||
Suggests: kde3-ktorrent
|
||||
Suggests: kde3-mplayerthumbs
|
||||
Suggests: kde3-servicemenu-mountiso
|
||||
Suggests: kde3-servicemenu-rootactions
|
||||
#Suggests: kde3-servicemenu-rpmxdgtool
|
||||
#Suggests: kde3-style-domino
|
||||
Suggests: kde3-style-ia-ora
|
||||
#Suggests: kde3-style-metal4kde
|
||||
Suggests: kde3-style-QtCurve
|
||||
Suggests: kde3-style-serenity
|
||||
#Suggests: kde3-yakuake
|
||||
#Suggests: kde-icons-os-k
|
||||
#Suggests: kde-icons-oxygen
|
||||
#Suggests: kde-style-baghira
|
||||
#Suggests: kde-style-lipstik
|
||||
Suggests: kmetabar
|
||||
#Suggests: kwinstyle-suse
|
||||
#Suggests: kwin-style-powder
|
||||
#Suggests: kwin-style-crystal
|
||||
Suggests: ksmoothdock
|
||||
#Suggests: kde3-gwenview-i18n
|
||||
Suggests: kde3-kaffeine-engine-gstreamer
|
||||
Suggests: kde3-kaffeine-engine-xine
|
||||
Suggests: kde3-kdebase
|
||||
|
||||
%description all
|
||||
This package is a meta-package, meaning that its purpose is to contain
|
||||
all packages for running the K Desktop Environment.
|
||||
|
||||
%files all
|
||||
%defattr(-,root,root-)
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Jul 26 2011 Tim Williams <tim@my-place.org.uk> 3.5.12-4mvt2010.2
|
||||
- Fix devel dependencies again
|
||||
|
||||
* Tue Jul 26 2011 Tim Williams <tim@my-place.org.uk> 3.5.12-3mvt2010.2
|
||||
+ Fix kde3-addons dependency in all package
|
||||
- Remove dependencies from all package: gwenview, digikam, kde-icons-tulliana, kde3-style-domino, kde3-style-kde4metal
|
||||
kde3-servicemenu-rpmxdgtool, kwinstyle-suse, kwinstyle-powder, kwin-style-crystal, kde3-yakuake
|
||||
kde-icons-os-k, kde-icons-oxygen, dde-style-baghira, kde-style-lipstik
|
||||
|
||||
* Wed Jul 21 2011 Tim Williams <tim@my-place.org.uk> 3.5.12-1mvt2010.2
|
||||
+ Fix depency issue in devel
|
||||
|
||||
* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 3.5.12-1mvt2010.2
|
||||
+ Rebuild for Trinity KDE 3.5.12
|
||||
|
||||
* Wed Jul 21 2010 Tim Williams <tim@my-place.org.uk> 3.5.10-10mvt2010.0
|
||||
+ Rebuild for MDV 2010.1
|
||||
|
||||
* Sat Jan 02 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 3.5.10-9mvt2010.0
|
||||
+ Added task-kde3-all package
|
||||
|
||||
* Tue Nov 17 2009 Tim Williams <tim@my-place.org.uk> 3.5.10-8mdv2010.0
|
||||
+ Rebuild for MDV 2010.0
|
||||
+ Change kdepim3-kontact dependency to kde3-kdepim-kontact
|
||||
+ Remove konversation
|
||||
+ kdegames now kdegames3
|
||||
- Remove mandriva-galaxy dependency
|
||||
|
||||
* Wed Apr 22 2009 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.10-4mdv2009.1
|
||||
+ Revision: 368611
|
||||
- Fix Requires
|
||||
|
||||
* Wed Apr 01 2009 Helio Chissini de Castro <helio@mandriva.com> 3.5.10-3mdv2009.1
|
||||
+ Revision: 363358
|
||||
- Solve dependencies
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- Fix Require for new arts package name
|
||||
|
||||
* Mon Sep 29 2008 Frederic Crozat <fcrozat@mandriva.com> 3.5.10-2mdv2009.0
|
||||
+ Revision: 289370
|
||||
- Add readahead as suggests
|
||||
|
||||
* Thu Sep 25 2008 Helio Chissini de Castro <helio@mandriva.com> 3.5.10-1mdv2009.0
|
||||
+ Revision: 288170
|
||||
- Suggests preload
|
||||
|
||||
* Sat Sep 20 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-10mdv2009.0
|
||||
+ Revision: 286171
|
||||
- Add ark and kmix as Suggests (Bug #41877 #41876)
|
||||
|
||||
* Fri Jul 18 2008 Olivier Blin <oblin@mandriva.com> 3.5.9-9mdv2009.0
|
||||
+ Revision: 238157
|
||||
- do not suggest digikam anymore, it is a kde4 application
|
||||
|
||||
* Mon Jun 02 2008 Rodrigo Gonçalves de Oliveira <rodrigo@mandriva.com> 3.5.9-7mdv2009.0
|
||||
+ Revision: 214312
|
||||
- Changed kde3-kdeaddons-metabar from Required to Suggested package.
|
||||
|
||||
* Mon May 19 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-6mdv2009.0
|
||||
+ Revision: 209222
|
||||
- Fix package name
|
||||
- Fix Spec file name
|
||||
- Order spec file sections
|
||||
Fix Requires
|
||||
- Add obsoletes
|
||||
- Fix some Requires
|
||||
- Rename to show which kde it is
|
||||
|
||||
* Thu Apr 03 2008 Anne Nicolas <anne.nicolas@mandriva.com> 3.5.9-5mdv2008.1
|
||||
+ Revision: 192170
|
||||
- Add kde-config-file suggest to fix #39724 (neoclust)
|
||||
|
||||
* Wed Mar 26 2008 Gustavo Pichorim Boiko <boiko@mandriva.com> 3.5.9-4mdv2008.1
|
||||
+ Revision: 190372
|
||||
- Requires gcc-c++, not gcc-g++
|
||||
|
||||
* Sat Mar 15 2008 Olivier Blin <oblin@mandriva.com> 3.5.9-3mdv2008.1
|
||||
+ Revision: 188069
|
||||
- only suggest konversation so that it can be skipped in One
|
||||
(kopete is already required)
|
||||
|
||||
* Wed Mar 05 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.9-2mdv2008.1
|
||||
+ Revision: 179452
|
||||
- Add task-pulseaudio as Suggests
|
||||
- New version 3.5.9
|
||||
|
||||
* Sun Jan 27 2008 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.8-1mdv2008.1
|
||||
+ Revision: 158801
|
||||
- Suggest kmilo
|
||||
- [BUGFIX] Add missing requires on task-kde-devel (Bug #35101)
|
||||
|
||||
+ Olivier Blin <oblin@mandriva.com>
|
||||
- restore BuildRoot
|
||||
|
||||
+ Thierry Vignaud <tvignaud@mandriva.com>
|
||||
- kill re-definition of %%buildroot on Pixel's request
|
||||
|
||||
* Mon Dec 17 2007 Pixel <pixel@mandriva.com> 3.5.7-12mdv2008.1
|
||||
+ Revision: 121622
|
||||
- rebuild for new "Suggests" rpm format
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- [FEATURE] Add kdegraphics-ksvg as Suggest (Bug #35321)
|
||||
|
||||
* Fri Oct 05 2007 Anne Nicolas <anne.nicolas@mandriva.com> 3.5.7-11mdv2008.0
|
||||
+ Revision: 95548
|
||||
- add mandriva-galaxy
|
||||
|
||||
* Thu Oct 04 2007 Anne Nicolas <anne.nicolas@mandriva.com> 3.5.7-10mdv2008.0
|
||||
+ Revision: 95317
|
||||
- fix suggests
|
||||
|
||||
* Fri Sep 28 2007 Nicolas Lécureuil <neoclust@mandriva.org> 3.5.7-9mdv2008.0
|
||||
+ Revision: 93620
|
||||
- Add kdenetwork-kget as Require
|
||||
|
||||
* Fri Sep 21 2007 Adam Williamson <awilliamson@mandriva.org> 3.5.7-8mdv2008.0
|
||||
+ Revision: 92068
|
||||
- okay, require krozat again, since boiko fixed it, and for safety
|
||||
|
||||
* Fri Sep 21 2007 Adam Williamson <awilliamson@mandriva.org> 3.5.7-7mdv2008.0
|
||||
+ Revision: 91999
|
||||
- don't require krozat
|
||||
|
||||
* Wed Sep 19 2007 Olivier Blin <oblin@mandriva.com> 3.5.7-6mdv2008.0
|
||||
+ Revision: 90814
|
||||
- suggest kerry instead of requiring it (so that it can be skipped on live systems)
|
||||
|
||||
* Fri Sep 14 2007 Helio Chissini de Castro <helio@mandriva.com> 3.5.7-5mdv2008.0
|
||||
+ Revision: 85689
|
||||
- Suggests kaffeine instead of kmplayer
|
||||
|
||||
* Thu Aug 30 2007 Helio Chissini de Castro <helio@mandriva.com> 3.5.7-4mdv2008.0
|
||||
+ Revision: 76262
|
||||
- Added konversation, kopete and standard fonts
|
||||
- Update task kde for new kde3-kdeaddons
|
||||
- Update to add konsole as default
|
||||
- Remove Mandriva galaxy as standard install
|
||||
|
||||
+ Anssi Hannula <anssi@mandriva.org>
|
||||
- add dependency on aspell, moved from kdelibs-common
|
||||
|
||||
+ Nicolas Lécureuil <neoclust@mandriva.org>
|
||||
- New KDE version 3.5.7
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
Many of the Mandriva TDE packages don't currently build without manual intervention.
|
||||
This is largely being caused by automake/autoconf issues which i'm expecting to be
|
||||
solved by the cmake migration in Trinity 3.5.13. Therefore, rather than spend a lot
|
||||
of time trying to fix an obsolete build process, i've got a procedure to work around
|
||||
the problem so that working Trinity packages can be built.
|
||||
|
||||
The build problem is caused compilation failures at a number of points in the build
|
||||
process, with the linker being unable to find various QT classes. This is being
|
||||
caused by an option in the compilation command "-Wl,--as-needed", this option only
|
||||
gets added to the compilation options when the build process is initiated by
|
||||
rpmbuild, if I use the ./configure command with the same options and build the
|
||||
sources manually, then this option is never added and the packages compile normally.
|
||||
Therefore, it is being added by something in the rpmbuild process. So, the current
|
||||
build procedure is:
|
||||
|
||||
1) execute
|
||||
rpmbuild -ba <spec file>
|
||||
as normal.
|
||||
2) If the build process crashes with the qt linking errors, switch to the build
|
||||
directory to perform a manual build.
|
||||
3) ensure /opt/kde3/bin is in the PATH environment variable.
|
||||
4) re-run ./configure, using the options stored in the config.log file.
|
||||
5) start make again. You might need to do a "make clean" if the build still fails
|
||||
with the same error.
|
||||
6) return to the SPEC's directory and execute
|
||||
rpmbuild -bi --short-circuit=i <spec file>
|
||||
followed by
|
||||
rpmbuild -ba --short-circuit=i <spec file>
|
||||
7) You should now have the RPM packages.
|
||||
@ -1,13 +0,0 @@
|
||||
Note on 2013/07/17 :
|
||||
|
||||
The stuff in this directory is obsolete.
|
||||
It looks like it was an attempt to build TDE 3.5.12 on Mandriva 2010.2 .
|
||||
|
||||
The current TDE packages are built as follow:
|
||||
|
||||
For 3.5.13.x:
|
||||
1) build "dependencies/qt3" from "mageia" directory
|
||||
2) build all other packages from "redhat" directory
|
||||
|
||||
For R14 and later:
|
||||
1) build all packages from "redhat" directory
|
||||
Loading…
Reference in new issue