auto-import kdelibs-3.2.1-1.4 from kdelibs-3.2.1-1.4.src.rpm
This commit is contained in:
cvsdist
parent
c9fe4d7fd1
commit
ebfd0aab2e
|
|
@ -1 +1 @@
|
|||
kdelibs-3.1.95.tar.bz2
|
||||
kdelibs-3.2.1.tar.bz2
|
||||
|
|
|
|||
67
kdelibs.spec
67
kdelibs.spec
|
|
@ -8,23 +8,22 @@
|
|||
%define debug 0
|
||||
%define final 0
|
||||
|
||||
%define qt_version 3.2.2
|
||||
%define arts_version 1.1.94
|
||||
%define qt_version 3.3.1
|
||||
%define arts_version 1.2.1
|
||||
|
||||
%define kde_major_version 3
|
||||
|
||||
%define libtool 1
|
||||
%define fam 1
|
||||
%define dnotify 0
|
||||
%define dnotify 1
|
||||
%define pcre 0
|
||||
%define alsa 1
|
||||
|
||||
Version: 3.1.95
|
||||
Release: 0.3
|
||||
Version: 3.2.1
|
||||
Release: 1.4
|
||||
Summary: K Desktop Environment - Libraries
|
||||
Name: kdelibs
|
||||
Url: http://www.kde.org/
|
||||
Icon: kde-icon.xpm
|
||||
Epoch: 6
|
||||
Group: System Environment/Libraries
|
||||
License: LGPL
|
||||
|
|
@ -35,7 +34,7 @@ Source1: kde.sh
|
|||
Source2: kde.csh
|
||||
|
||||
Patch2: kdelibs-3.0.0-ndebug.patch
|
||||
Patch3: kdelibs-3.1.4-icon.patch
|
||||
Patch3: kdelibs-3.2.0-icon.patch
|
||||
Patch4: kdelibs-3.0.4-ksyscoca.patch
|
||||
Patch11: kdelibs-3.1.93-lib64.patch
|
||||
Patch15: kdelibs-3.1.95-buildroot.patch
|
||||
|
|
@ -43,7 +42,7 @@ Patch16: kdelibs-3.1-ssl-krb5.patch
|
|||
Patch20: kdelibs-3.1-defaultstyle.patch
|
||||
Patch22: kdelibs-3.1-kio.patch
|
||||
Patch24: kdelibs-3.1-libtool.patch
|
||||
Patch28: kdelibs-3.1.2-openssl.patch
|
||||
Patch28: kdelibs-3.1.3-openssl.patch
|
||||
|
||||
Requires: qt >= 1:%{qt_version}
|
||||
Requires: arts >= 8:%{arts_version}
|
||||
|
|
@ -52,8 +51,9 @@ Requires: cups-libs >= 1.1.12
|
|||
|
||||
%if %{redhatify}
|
||||
Requires: desktop-backgrounds-basic
|
||||
Requires: redhat-artwork >= 0.83
|
||||
Requires: redhat-artwork >= 0.90.1
|
||||
Requires: hicolor-icon-theme
|
||||
Requires: redhat-menus >= 1.0
|
||||
%endif
|
||||
|
||||
Prereq: fileutils
|
||||
|
|
@ -69,11 +69,11 @@ BuildPrereq: fam-devel
|
|||
BuildPrereq: pcre-devel
|
||||
%endif
|
||||
|
||||
BuildPrereq: cups-devel >= 1.1.12
|
||||
BuildPrereq: cups-devel >= 1.1.20
|
||||
BuildPrereq: qt-devel >= %{qt_version}
|
||||
BuildPrereq: flex >= 2.5.4a-13
|
||||
BuildPrereq: doxygen
|
||||
BuildPrereq: libxslt-devel >= 1.0.9
|
||||
BuildPrereq: libxslt-devel >= 1.1.2
|
||||
BuildPrereq: sgml-common
|
||||
BuildPrereq: openjade
|
||||
BuildPrereq: jadetex
|
||||
|
|
@ -82,7 +82,7 @@ BuildPrereq: docbook-style-dsssl
|
|||
BuildPrereq: perl-SGMLSpm
|
||||
BuildPrereq: docbook-utils
|
||||
BuildPrereq: zlib-devel
|
||||
BuildPrereq: arts-devel >= 7:1.1.1
|
||||
BuildPrereq: arts-devel >= 7:1.2.1
|
||||
BuildPrereq: audiofile-devel
|
||||
BuildPrereq: openssl-devel
|
||||
BuildPrereq: perl
|
||||
|
|
@ -93,7 +93,7 @@ BuildPrereq: bzip2-devel
|
|||
BuildPrereq: libjpeg-devel
|
||||
BuildPrereq: pkgconfig
|
||||
%if %{alsa}
|
||||
BuildPrereq: alsa-lib-devel >= 0.9.8
|
||||
BuildPrereq: alsa-lib-devel >= 1.0.2
|
||||
%endif
|
||||
Obsoletes: %{name}2
|
||||
Obsoletes: kdesupport
|
||||
|
|
@ -126,7 +126,7 @@ format for easy browsing.
|
|||
%if %{debug} == 0
|
||||
%patch2 -p1 -b .debug
|
||||
%endif
|
||||
#%patch3 -p1 -b .icon
|
||||
%patch3 -p1 -b .icon
|
||||
%patch4 -p1 -b .ksyscoca
|
||||
%patch11 -p1 -b .lib64
|
||||
%patch15 -p1 -b .buildroot
|
||||
|
|
@ -199,7 +199,7 @@ fi
|
|||
%if %{dnotify}
|
||||
--enable-dnotify \
|
||||
%endif
|
||||
%if %{pcre}
|
||||
%if %{pcre} == 0
|
||||
--disable-pcre \
|
||||
%endif
|
||||
--disable-rpath
|
||||
|
|
@ -210,7 +210,7 @@ fi
|
|||
perl -pi -e 's,^pic_flag=" -fPIC -DPIC",pic_flag=" -fpic",g' libtool
|
||||
%endif
|
||||
|
||||
make %{?smp_mflags}
|
||||
make %{?_smp_mflags}
|
||||
make apidox
|
||||
|
||||
%install
|
||||
|
|
@ -242,6 +242,7 @@ popd
|
|||
|
||||
%if %{redhatify}
|
||||
rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/index.theme
|
||||
mv $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu.kde
|
||||
%endif
|
||||
|
||||
%clean
|
||||
|
|
@ -342,6 +343,40 @@ fi
|
|||
%doc %{_docdir}/HTML/en/kdelibs*
|
||||
|
||||
%changelog
|
||||
* Fri Mar 12 2004 Than Ngo <than@redhat.com> 6:3.2.1-1.4
|
||||
- rebuild
|
||||
|
||||
* Thu Mar 11 2004 Than Ngo <than@redhat.com> 6:3.2.1-1.3
|
||||
- get rid of application.menu, it's added in redhat-menus
|
||||
|
||||
* Fri Mar 05 2004 Than Ngo <than@redhat.com> 6:3.2.1-1.2
|
||||
- respin
|
||||
|
||||
* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Tue Mar 02 2004 Than Ngo <than@redhat.com> 3.2.1-1
|
||||
- update to 3.2.1 release
|
||||
|
||||
* Tue Feb 17 2004 Than Ngo <than@redhat.com> 6:3.2.0-1.5
|
||||
- fix typo bug, _smp_mflags instead smp_mflags
|
||||
|
||||
* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
|
||||
- rebuilt
|
||||
|
||||
* Mon Feb 09 2004 Than Ngo <than@redhat.com> 6:3.2.0-0.4
|
||||
- add new icon patch file
|
||||
|
||||
* Thu Feb 05 2004 Than Ngo <than@redhat.com> 6:3.2.0-0.3
|
||||
- build against qt 3.3.0
|
||||
- fix a bug in ksslopen on x86_64, bug #114835
|
||||
|
||||
* Tue Feb 03 2004 Than Ngo <than@redhat.com> 6:3.2.0-0.2
|
||||
- 3.2.0 release
|
||||
|
||||
* Fri Jan 23 2004 Than Ngo <than@redhat.com> 6:3.1.95-0.4
|
||||
- fixed #114114
|
||||
|
||||
* Wed Jan 21 2004 Than Ngo <than@redhat.com> 6:3.1.95-0.3
|
||||
- fixed file conflict with hicolor-icon-theme
|
||||
- added requires: hicolor-icon-theme
|
||||
|
|
|
|||
Loading…
Reference in New Issue