rpms/kdelibs
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

auto-import kdelibs-3.1-10 from kdelibs-3.1-10.src.rpm

Browse Source
This commit is contained in:
cvsdist 2004-09-09 06:59:55 +00:00
parent af63870203
commit 4ad6ef6c97
4 changed files with 152 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kdelibs-3.1-libtool.patch Normal file
View File

@ -0,0 +1,17 @@
--- kdelibs-3.1/admin/ltmain.sh.orig 2003-02-20 17:52:07.000000000 -0500
+++ kdelibs-3.1/admin/ltmain.sh 2003-02-20 18:30:32.000000000 -0500
@@ -4459,6 +4459,14 @@
case $host,$output,$installed,$module,$dlname in
*cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
esac
+ newdeplib=""
+ for j in $dependency_libs ; do
+ if echo $j | grep "gcc-lib" >& /dev/null ; then
+ continue
+ fi
+ newdeplib="$newdeplib $j"
+ done
+ dependency_libs="$newdeplib"
$echo > $output "\
# $outputname - a libtool library file
# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP

11
kdelibs-3.1-ssl-krb5.patch Normal file
View File

@ -0,0 +1,11 @@
--- kdelibs-3.1/admin/acinclude.m4.in.ORIG 2003-01-10 09:32:45.000000000 -0500
+++ kdelibs-3.1/admin/acinclude.m4.in 2003-01-10 09:33:00.000000000 -0500
@@ -5090,7 +5090,7 @@
ssl_incdirs="/usr/include /usr/local/include /usr/ssl/include /usr/local/ssl/include $prefix/include $kde_extra_includes"
ssl_incdirs="$ac_ssl_includes $ssl_incdirs"
AC_FIND_FILE(openssl/ssl.h, $ssl_incdirs, ssl_incdir)
- ac_ssl_includes="$ssl_incdir"
+ ac_ssl_includes="$ssl_incdir -I/usr/kerberos/include"
ssl_libdirs="/usr/lib /usr/local/lib /usr/ssl/lib /usr/local/ssl/lib $prefix/lib $exec_prefix/lib $kde_extra_libs"
if test ! "$ac_ssl_libraries" = "NO"; then

195
kdelibs.spec
View File

@ -1,44 +1,20 @@
%define _missing_doc_files_terminate_build 0
%define _unpackaged_files_terminate_build 0
%define build_release 0
%define build_beta 1
%define build_snapshot 2
%define isClean 1
%define isBuild %{build_release}
%define debug 0
%define release_number 0.3
%define build_for_ftp 0
%define cups 1
%define qtversion 3.1.0
%define qtversion 3.1.1
%define kde_major_version 3
%define desktop_file 1
%define desktop_file_utils_version 0.2.93
%define libtool 0
%if %{desktop_file}
Requires: desktop-backgrounds-basic
Requires: redhat-menus => 0.26
Requires: redhat-artwork >= 0.49
Prereq: fileutils
Prereq: desktop-file-utils >= %{desktop_file_utils_version}
%endif
%if %{build_for_ftp}
ExclusiveArch: %{ix86}
%endif
%define libtool 1
Version: 3.1
Release: 10
Summary: K Desktop Environment - Libraries
Name: kdelibs
Url: http://www.kde.org/
@ -48,23 +24,7 @@ Group: System Environment/Libraries
License: LGPL
BuildRoot: %{_tmppath}/%{name}-buildroot
%if "%{isBuild}" == "%{build_release}"
%define release_name %{nil}
Release: %{release_number}
Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/distribution/tar/generic/source/%{name}-%{version}.tar.bz2
%endif
%if "%{isBuild}" == "%{build_beta}"
%define release_name beta1
Release: 0.%{release_name}.%{release_number}
Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/distribution/tar/generic/source/%{name}-%{release_name}.tar.bz2
%endif
%if "%{isBuild}" == "%{build_snapshot}"
%define release_name 20020807
Release: 0.%{release_name}cvs.%{release_number}
Source: cvs://cvs.kde.org/%{name}-%{release_name}.tar.bz2
%endif
Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
Patch1: kdelibs-3.0-noxs.patch
Patch2: kdelibs-3.0.0-ndebug.patch
@ -81,15 +41,36 @@ Patch12: kioslavetest.patch
Patch13: metatest.patch
Patch14: kdelibs-3.1-ansi.patch
Patch15: kdelibs-3.1-buildroot.patch
Patch16: kdelibs-3.1-ssl-krb5.patch
Patch18: kdelibs-3.1-icon_scale.patch
Patch19: kdelibs-3.1-kate.patch
Patch20: kdelibs-3.1-defaultstyle.patch
Patch21: kdelibs-3.1-flash.patch
Patch22: kdelibs-3.1-kio.patch
Patch23: kdelibs-3.1-no.patch
Patch24: kdelibs-3.1-libtool.patch
Patch25: kdelibs-3.1-gnome-menu.patch
Requires: qt >= %{qtversion}
Requires: arts >= 7:1.1.0
Requires: qt >= 1:%{qtversion}
Requires: arts >= 8:1.1-5
%if %{cups}
Requires: cups-libs >= 1.1.12
BuildRequires: cups-devel >= 1.1.12
%endif
%if %{desktop_file}
Requires: desktop-backgrounds-basic
Requires: redhat-menus => 0.30
Requires: redhat-artwork >= 0.53
Prereq: fileutils
Prereq: desktop-file-utils >= %{desktop_file_utils_version}
%endif
%if %{build_for_ftp}
ExclusiveArch: %{ix86}
%endif
BuildPrereq: qt-devel >= %{qtversion}
BuildPrereq: flex >= 2.5.4a-13
BuildPrereq: doxygen
@ -125,8 +106,8 @@ kimgio (image manipulation).
%package devel
Group: Development/Libraries
Summary: Header files and documentation for compiling KDE applications.
Requires: qt-devel >= %{qtversion}
Requires: %{name} = %{version}
Requires: qt-devel >= 1:%{qtversion}
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: pcre-devel
Obsoletes: kdesupport-devel
@ -136,11 +117,7 @@ applications for KDE. Also included is the KDE API documentation in HTML
format for easy browsing.
%prep
%if "%{isBuild}" == "%{build_release}"
%setup -q
%else
%setup -q -n %{name}-%{version}-%{release_name}
%endif
%patch1 -p1 -b .noxs
%if %{debug} == 0
@ -158,17 +135,20 @@ format for easy browsing.
%patch12 -p0
%patch13 -p0
%patch15 -p1 -b .buildroot
%patch16 -p1 -b .ssl-krb5
%patch18 -p1 -b .icon_scale
%patch19 -p1 -b .kate
%patch20 -p1 -b .defaultstyle
%patch21 -p1
%patch22 -p1 -b .kio
%patch23 -p1 -b .no
%patch24 -p1 -b .libtool
%patch25 -p1 -b .redhat
# add redhat into KDE_VERSION_STRING
perl -pi -e "s,^#define KDE_VERSION_STRING .*,#define KDE_VERSION_STRING \"%{version}-%{release} Red Hat\"," kdecore/kdeversion.h
%if %{libtool}
# Workaround for legacy auto* tools
if [ -e /usr/bin/automake-1.5 ]; then
ln -s /usr/bin/automake-1.5 automake
ln -s /usr/bin/aclocal-1.5 aclocal
export PATH=`pwd`:$PATH
fi
make -f Makefile.cvs
%endif
@ -213,10 +193,8 @@ fi
--disable-libfam \
--without-libfam
make %{?_smp_mflags}
# creat documents
doxygen Doxyfile
make %{?smp_mflags}
make apidox
%install
rm -rf $RPM_BUILD_ROOT
@ -225,12 +203,8 @@ make DESTDIR=$RPM_BUILD_ROOT install
chmod a+x $RPM_BUILD_ROOT%{_libdir}/*
# Generate documentation
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
cp -aR apidocs/html/* $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
install -m 644 KDE2PORTING.html $RPM_BUILD_ROOT%{_docdir}/%{name}-devel-%{version}
pushd $RPM_BUILD_ROOT%{_docdir}
ln -sf %{name}-devel-%{version} %{name}-devel-%{kde_major_version}
ln -sf HTML/en/kdelibs-3.1-apidocs %{name}-devel-%{kde_major_version}
popd
# Make symlinks relative
@ -252,12 +226,13 @@ desktop-file-install \
--add-category "X-KDE-Components" \
--add-only-show-in KDE \
$RPM_BUILD_ROOT%{_datadir}/applnk/Settings/Components/*.desktop
# delete unneeded files
rm -rfv $RPM_BUILD_ROOT%{_datadir}/applnk
%endif
%clean
%if %{isClean}
rm -rf $RPM_BUILD_ROOT
%endif
%post -p /sbin/ldconfig
@ -343,7 +318,10 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/services/*.desktop
%{_datadir}/services/kded
%{_datadir}/servicetypes
%doc %{_datadir}/doc/HTML/*
%dir %{_docdir}/HTML
%dir %{_docdir}/HTML/en
%doc %{_docdir}/HTML/en/common
%doc %{_docdir}/HTML/en/kspell
%if %{cups}
%{_bindir}/cups*
%{_libdir}/libcups*
@ -354,10 +332,83 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/dcopidl*
%{_includedir}/kde
%doc %{_docdir}/%{name}-devel-%{kde_major_version}
%dir %{_docdir}/%{name}-devel-%{version}
%doc %{_docdir}/%{name}-devel-%{version}/*
%doc %{_docdir}/HTML/en/kdelibs-3.1-apidocs
%changelog
* Mon Feb 24 2003 Than Ngo <than@redhat.com> 6:3.1-10
- move API documentation into kdelibs-devel (#84976)
* Fri Feb 21 2003 Than Ngo <than@redhat.com> 6:3.1-9
- add fix from Thomas Wörner to watch /usr/share/applications
for changes, (bug #71613)
* Thu Feb 20 2003 Than Ngo <than@redhat.com> 6:3.1-8
- rebuid against gcc 3.2.2 to fix dependency in la file
* Thu Feb 13 2003 Thomas Woerner <twoerner@redhat.com> 6:3.1-7
- fixed arts bug #82750, requires rebuild of kdelibs
* Tue Feb 11 2003 Than Ngo <than@redhat.com> 6:3.1-6
- fix Norway i18n issue, bug #73446
* Mon Feb 10 2003 Than Ngo <than@redhat.com> 6:3.1-5
- konqueror crashes on a double click, bug #81503
* Sun Feb 9 2003 Than Ngo <than@redhat.com> 6:3.1-4
- add patch to support the macromedia, bug #83808
* Thu Feb 6 2003 Than Ngo <than@redhat.com> 6:3.1-3
- add patch to set correct default encoding, bug #82539
- don't overwrite defaultstyle, bug #74795, #80103
* Fri Jan 31 2003 Than Ngo <than@redhat.com> 6:3.1-2
- Add better resize icon patch from Thomas Woerner
* Tue Jan 28 2003 Than Ngo <than@redhat.com> 6:3.1-1
- 3.1 final
* Sun Jan 26 2003 Than Ngo <than@redhat.com> 6:3.1-0.16
- use make apidox to create KDE api instead doxygen
* Thu Jan 24 2003 Than Ngo <than@redhat.com> 6:3.1-0.15
- use doxygen to create api docs
- clean up specfile
* Thu Jan 23 2003 Tim Powers <timp@redhat.com> 6:3.1-0.14
- rebuild
* Wed Jan 22 2003 Than Ngo <than@redhat.com> 3.1-0.13
- rc7
* Thu Jan 16 2003 Thomas Woerner <twoerner@redhat.com> 3.1-0.12
- added icon scale patch
- added ia64 again
* Mon Jan 13 2003 Thomas Woerner <twoerner@redhat.com> 3.1-0.11
- excluded ia64
* Sun Jan 12 2003 Thomas Woerner <twoerner@redhat.com> 3.1-0.10
- rebuild
* Fri Jan 10 2003 Thomas Woerner <twoerner@redhat.com> 3.1-0.9
- removed silly size_t check
* Fri Jan 10 2003 Thomas Woerner <twoerner@redhat.com> 3.1-0.8
- rc6
* Fri Jan 10 2003 Thomas Woerner <twoerner@redhat.com> 3.1-0.7
- ssl uses krb5
* Sat Dec 28 2002 Than Ngo <than@redhat.com> 3.1-0.6
- rebuild
* Mon Dec 16 2002 Than Ngo <than@redhat.com> 3.1-0.5
- rebuild
* Thu Dec 12 2002 Than Ngo <than@redhat.com> 3.1-0.4
- fix dependency bug
- use kdoc to create api docs
* Sat Nov 30 2002 Than Ngo <than@redhat.com> 3.1-0.3
- fix bug #78646
- set kde_major_version

2
sources
View File

@ -1 +1 @@
72eae85bbd4a5a270d8d44dc351373c4 kdelibs-3.1.tar.bz2
4b5cb94d5889134ba4e86749e6b5476c kdelibs-3.1.tar.bz2