rpms/kdelibs/devel kdelibs-3.5.7-cups13.patch, 1.2, 1.3 kdelibs.spec, 1.222, 1.223 kdelibs-3.5.7-ICEauthority.patch, 1.1, NONE

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Fri Jul 20 13:12:23 UTC 2007


Author: rdieter

Update of /cvs/pkgs/rpms/kdelibs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5495

Modified Files:
	kdelibs-3.5.7-cups13.patch kdelibs.spec 
Removed Files:
	kdelibs-3.5.7-ICEauthority.patch 
Log Message:
* Wed Jul 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-13
- build fails against cups-1.3 (#248717)
- incorporate kdelibs3 bits (not enabled... yet) 


kdelibs-3.5.7-cups13.patch:

Index: kdelibs-3.5.7-cups13.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs-3.5.7-cups13.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kdelibs-3.5.7-cups13.patch	19 Jul 2007 19:27:48 -0000	1.2
+++ kdelibs-3.5.7-cups13.patch	20 Jul 2007 13:12:20 -0000	1.3
@@ -1,6 +1,6 @@
---- kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c.cups13	2007-07-18 14:50:28.000000000 +0100
-+++ kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c	2007-07-18 15:34:00.000000000 +0100
-@@ -108,7 +108,8 @@
+--- kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c.cups13	2006-10-01 12:33:43.000000000 -0500
++++ kdelibs-3.5.7/kdeprint/cups/cupsdconf2/cups-util.c	2007-07-19 15:12:48.000000000 -0500
+@@ -108,7 +108,8 @@ cupsGetConf(void)
        * See if we should retry the current digest password...
        */
  
@@ -10,7 +10,7 @@
            digest_tries > 1 || !pwdstring[0])
        {
         /*
-@@ -116,7 +117,7 @@
+@@ -116,7 +117,7 @@ cupsGetConf(void)
  	*/
  
  	snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
@@ -19,7 +19,7 @@
  
          if ((password = cupsGetPassword(prompt)) == NULL)
  	  break;
-@@ -135,7 +136,8 @@
+@@ -135,7 +136,8 @@ cupsGetConf(void)
        * Got a password; encode it for the server...
        */
  
@@ -29,7 +29,7 @@
        {
         /*
  	* Basic authentication...
-@@ -334,7 +336,8 @@
+@@ -334,7 +336,8 @@ cupsPutConf(const char *name)		/* I - Na
        * See if we should retry the current digest password...
        */
  
@@ -39,7 +39,7 @@
            digest_tries > 1 || !pwdstring[0])
        {
         /*
-@@ -342,7 +345,7 @@
+@@ -342,7 +345,7 @@ cupsPutConf(const char *name)		/* I - Na
  	*/
  
  	snprintf(prompt, sizeof(prompt), "Password for %s on %s? ", cupsUser(),
@@ -48,7 +48,7 @@
  
          if ((password = cupsGetPassword(prompt)) == NULL)
  	  break;
-@@ -361,7 +364,8 @@
+@@ -361,7 +364,8 @@ cupsPutConf(const char *name)		/* I - Na
        * Got a password; encode it for the server...
        */
  
@@ -58,9 +58,9 @@
        {
         /*
  	* Basic authentication...
---- kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp.cups13	2007-07-19 15:51:14.000000000 +0100
-+++ kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp	2007-07-19 15:57:49.000000000 +0100
-@@ -309,7 +309,8 @@
+--- kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp.cups13	2007-01-15 05:34:19.000000000 -0600
++++ kdelibs-3.5.7/kdeprint/cups/ipprequest.cpp	2007-07-19 15:15:09.000000000 -0500
+@@ -309,7 +309,8 @@ bool IppRequest::doFileRequest(const QSt
  		return false;
  	}
  
@@ -70,12 +70,12 @@
  	strncpy( HTTP->authstring, cups_authstring.data(), HTTP_MAX_VALUE );
  #endif
  
-@@ -319,7 +320,8 @@
+@@ -319,7 +320,8 @@ bool IppRequest::doFileRequest(const QSt
  	}
  
  	request_ = cupsDoFileRequest(HTTP, request_, (res.isEmpty() ? "/" : res.latin1()), (filename.isEmpty() ? NULL : filename.latin1()));
 -#ifdef HAVE_CUPS_NO_PWD_CACHE
-+#ifdef HAVE_CUPS_NO_PWD_CACHE && \
++#if defined(HAVE_CUPS_NO_PWD_CACHE) && \
 +    CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 3
  	cups_authstring = HTTP->authstring;
  #endif


Index: kdelibs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs/devel/kdelibs.spec,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- kdelibs.spec	19 Jul 2007 19:27:48 -0000	1.222
+++ kdelibs.spec	20 Jul 2007 13:12:20 -0000	1.223
@@ -4,33 +4,44 @@
 #define debug 1 
 %define final 1
 %define kde_settings 1 
-%define apidocs 1
 
-%define qt_epoch 1
+%define arts 1
 %define arts_epoch 8
-%define cups_epoch 1
-
-%define qt_version 3.3.8
 %define arts_version 1.5.7
-%define kde_major_version 3
 
+%define qt_epoch 1
+%define qt_version 3.3.8
 %global qt_ver %(pkg-config --modversion qt-mt 2>/dev/null || echo %{qt_version})
 %define qtdocdir %{_docdir}/qt-devel-%{qt_ver}
 
+%define kde_major_version 3
+
 %define make_cvs 1
-%define arts 1
 
-Name:    kdelibs
-Summary: K Desktop Environment - Libraries
-Epoch:   6
 Version: 3.5.7
-Release: 12%{?dist}
+Release: 13%{?dist}
+
+#if 0%{?fedora} > 7
+%if 0
+Name:     kdelibs3
+Provides: kdelibs = 6:%{version}-%{release}
+%else
+Name:     kdelibs
+Epoch:    6
+%define   apidocs 1
+%define	  libkdnssd libkdnssd
+# To help transition to kde4
+Provides: kdelibs3 = %{version}-%{release}
+%endif
+
+Summary: K Desktop Environment - Libraries
 
 License: LGPL
-Url: http://www.kde.org/
-Group: System Environment/Libraries
+Url:	 http://www.kde.org/
+Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+
+Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}.tar.bz2
 Source1: kde.sh
 Source2: kde.csh
 Source3: devices.protocol
@@ -49,7 +60,6 @@
 Patch39: kdelibs-3.5.4-kabc-make.patch
 Patch40: kdelibs-3.5.4-kdeprint-utf8.patch
 Patch41: kdelibs-3.5.6-utempter.patch
-Patch42: kdelibs-3.5.7-ICEauthority.patch
 Patch43: kdelibs-3.5.6-lang.patch
 Patch44: kdelibs-3.5.7-cups13.patch
 
@@ -68,12 +78,8 @@
 Patch139445: kdelibs-3.5.5-lib_loader-1.2.patch
 #BuildRequires: boost-devel
 
-# To help transition to kde4
-Provides: kdelibs3 = %{version}-%{release}
-
-Requires: arts >= %{arts_epoch}:%{arts_version}
+%{?arts:Requires: arts >= %{arts_epoch}:%{arts_version}}
 Requires: qt >= %{qt_epoch}:%{qt_ver}
-Requires: cups-libs >= %{cups_epoch}:1.1.12
 Requires: hicolor-icon-theme
 %if %{kde_settings}
 Requires: kde-settings >= 3.5
@@ -84,12 +90,8 @@
 # kdesu/sudo support, http://bugs.kde.org/20914
 BuildRequires: sudo
 Requires(hint): sudo
-# dnssd, FIXME/TODO
-#BuildRequires: mDNSResponder-devel
 
 %if 0%{?fedora} > 4 || 0%{?rhel} > 4
-%define libkdnssd libkdnssd
-Requires: libkdnssd
 %define BuildRequires: xorg-x11-proto-devel libX11-devel
 %define _with_rgbfile --with-rgbfile=%{_datadir}/X11/rgb.txt
 Requires: iceauth
@@ -98,12 +100,13 @@
 Requires(pre): coreutils
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
+%{?libkdnssd:Requires: %{libkdnssd}}
 
 BuildRequires: gettext
 BuildRequires: pcre-devel
-BuildRequires: cups-devel >= %{cups_epoch}:1.1.20, cups
+BuildRequires: cups-devel cups
 BuildRequires: qt-devel qt-devel-docs
-BuildRequires: arts-devel >= %{arts_epoch}:%{arts_version}
+%{?arts:BuildRequires: arts-devel >= %{arts_epoch}:%{arts_version}}
 BuildRequires: flex >= 2.5.4a-13
 BuildRequires: doxygen
 BuildRequires: libxslt-devel
@@ -156,23 +159,28 @@
 %package devel
 Group: Development/Libraries
 Summary: Header files and documentation for compiling KDE applications.
+%if "%{name}" == "kdelibs"
 Provides: kdelibs3-devel = %{version}-%{release}
-Requires: %{name} = %{epoch}:%{version}-%{release}
+%else
+Conflicts: kdelibs-devel
+Provides:  kdelibs-devel = 6:%{version}-%{release}
+%endif
+Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires: qt-devel
-Requires: arts-devel
+%{?arts:Requires: arts-devel}
 %{?libkdnssd:Requires: libkdnssd-devel}
-## those below can/should be omitted from future builds -- Rex
-Requires: libart_lgpl-devel
-Requires: libxslt-devel
-Requires: libjpeg-devel
-Requires: zlib-devel
 Requires: openssl-devel
-Requires: bzip2-devel
-Requires: libtiff-devel
-Requires: libidn-devel
-Requires: libacl-devel
-Requires: pcre-devel
-%{?_with_libutempter:Requires: libutempter-devel}
+## those below can/should be omitted from future builds -- Rex
+#Requires: libart_lgpl-devel
+#Requires: libxslt-devel
+#Requires: libjpeg-devel
+#Requires: zlib-devel
+#Requires: bzip2-devel
+#Requires: libtiff-devel
+#Requires: libidn-devel
+#Requires: libacl-devel
+#Requires: pcre-devel
+#{?_with_libutempter:Requires: libutempter-devel}
 %description devel
 This package includes the header files you will need to compile
 applications for KDE.
@@ -188,7 +196,8 @@
 
 
 %prep
-%setup -q
+%setup -q -n kdelibs-%{version}
+
 %patch1 -p1 -b .xdg-menu
 %if "%{?debug}" != "1"
 %patch2 -p1 -b .debug
@@ -206,7 +215,6 @@
 %patch40 -p1 -b .kdeprint-utf8
 %{?_with_libutempter:%patch41 -p1 -b .utempter}
 # omission recommended by upstream: http://bugs.kde.org/147454#c37
-#patch42 -p1 -b .ICEauthority
 %patch43 -p1 -b .lang
 %patch44 -p1 -b .cups13
 
@@ -269,7 +277,7 @@
 make %{?_smp_mflags}
 
 # FIXME/TODO: build as noarch?  -- Rex
-%if %{apidocs}
+%if "%{?apidocs}" == "1"
 make %{?_smp_mflags} apidox
 %endif
 
@@ -282,12 +290,11 @@
 chmod a+x %{buildroot}%{_libdir}/*
 install -p -m 644 %{SOURCE3} %{buildroot}%{_datadir}/services/devices.protocol
 
+%if "%{?apidocs}" == "1"
 pushd %{buildroot}%{_docdir}
 ln -sf HTML/en/kdelibs-apidocs %{name}-devel-%{kde_major_version}
 popd
-
-mkdir -p %{buildroot}%{_sysconfdir}/profile.d
-install -p -m 755 %{SOURCE1} %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/
+%endif
 
 # Make symlinks relative
 pushd %{buildroot}%{_docdir}/HTML/en
@@ -299,6 +306,13 @@
 done
 popd
 
+%if "%{name}" == "kdelibs3"
+install -p -m 755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde3.sh
+install -p -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde3.csh
+%else
+install -p -m 755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d/kde.sh
+install -p -m 755 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d/kde.csh
+
 ## menus
 mkdir -p %{buildroot}%{_sysconfdir}/kde/xdg/menus
 mv %{buildroot}%{_sysconfdir}/xdg/menus/applications.menu \
@@ -308,6 +322,7 @@
       %{buildroot}%{_sysconfdir}/kde/xdg/menus/kde-applications.menu
 ln -s kde-applications.menu \
       %{buildroot}%{_sysconfdir}/kde/xdg/menus/applications.menu
+%endif
 
 echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/kresources.desktop
 
@@ -346,117 +361,72 @@
 # libkdnssd bits
 rm -f %{buildroot}%{_libdir}/libkdnssd.la
 %{?libkdnssd:rm -rf %{buildroot}{%{_libdir}/libkdnssd.*,%{_includedir}/kde/dnssd}}
+%if "%{name}" != "kdelibs"
+# remove conflicts with kdelibs-4
+pushd %{buildroot}%{_bindir}
+rm -f checkXML cupsdconf cupsdoprint imagetops kaddprinterwizard kconfig_compiler kconf_update kcookiejar \
+      kde-menu kdesu_stub kdontchangethehostname kdostartupconfig kio_http_cache_cleaner kioslave \
+      klauncher kpac_dhcp_helper ksendbugmail kstartupconfig ksvgtopng ktradertest kunittestmodrunner \
+      make_driver_db_cups make_driver_db_lpr makekdewidgets meinproc preparetips \
+      khotnewstuff kinstalltheme kcmshell kfile kioexec
+popd
+rm -f  %{buildroot}%{_datadir}/config/* %{buildroot}%{_datadir}/config/ui/kprintpreviewui.rc || :
+rm -rf %{buildroot}%{_datadir}/config/colors %{buildroot}%{_datadir}/apps/k* %{buildroot}%{_datadir}/apps/LICENSES \
+       %{buildroot}%{_datadir}/apps/proxyscout %{buildroot}%{_datadir}/locale %{buildroot}%{_datadir}/icons \
+       %{buildroot}%{_datadir}/autostart %{buildroot}/etc/xdg %{buildroot}%{_docdir}/HTML %{buildroot}%{_datadir}/emoticons
+%endif
 
 
 %clean
 rm -rf %{buildroot}
 
 
-# Not sure if this is really needed anymore, but doesn't look harmful either -- Rex
-%pre
-if [ -d /etc/skel/Desktop/Autostart ]; then
-   mv -f /etc/skel/Desktop/Autostart /etc/skel/Desktop/Autostart-OLD..KDE
-elif [ -d /etc/skel/Desktop/Autostart.rpmsave ]; then
-   mv -f /etc/skel/Desktop/Autostart.rpmsave /etc/skel/Desktop/Autostart-OLD..KDE
-fi
-exit 0
-
 %post
 /sbin/ldconfig
+%if "%{name}" == "kdelibs"
 touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
+%endif
 %{_bindir}/update-desktop-database > /dev/null 2>&1 || :
 
 %postun
 /sbin/ldconfig
+%if "%{name}" == "kdelibs"
 touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/crystalsvg 2> /dev/null || :
+%endif
 %{_bindir}/update-desktop-database > /dev/null 2>&1 || :
 
 
 %files
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/profile.d/*
-%{_sysconfdir}/kde/xdg/menus/*.menu
-%{_sysconfdir}/xdg/menus/*.menu
-%{_bindir}/artsmessage
-%{_bindir}/checkXML
-%{_bindir}/cupsdconf
-%{_bindir}/cupsdoprint
-%{_bindir}/dcop
-%{_bindir}/dcopclient
-%{_bindir}/dcopfind
-%{_bindir}/dcopobject
-%{_bindir}/dcopquit
-%{_bindir}/dcopref
-%{_bindir}/dcopserver
-%{_bindir}/dcopserver_shutdown
-%{_bindir}/dcopstart
-%{_bindir}/filesharelist
-%{_bindir}/fileshareset
-%{_bindir}/imagetops
-%{_bindir}/kab2kabc
-%{_bindir}/kaddprinterwizard
-%{_bindir}/kbuildsycoca
-%{_bindir}/kcmshell
-%{_bindir}/kconf_update
-%{_bindir}/kconfig_compiler
-%{_bindir}/kcookiejar
-%{_bindir}/kde-config
-%{_bindir}/kde-menu
-%{_bindir}/kded
-%{_bindir}/kdeinit
-%{_bindir}/kdeinit_shutdown
-%{_bindir}/kdeinit_wrapper
-%{_bindir}/kdesu_stub
-%{_bindir}/kdontchangethehostname
-%{_bindir}/kdostartupconfig
-%{_bindir}/kfile
-%{_bindir}/kfmexec
-%{_bindir}/khotnewstuff
-%{_bindir}/kinstalltheme
-%{_bindir}/kio_http_cache_cleaner
-%{_bindir}/kio_uiserver
-%{_bindir}/kioexec
-%{_bindir}/kioslave
-%{_bindir}/klauncher
-%{_bindir}/kmailservice
-%{_bindir}/ksendbugmail
-%{_bindir}/kshell
-%{_bindir}/kstartupconfig
-%{_bindir}/ksvgtopng
-%{_bindir}/ktelnetservice
-%{_bindir}/ktradertest
-%{_bindir}/kunittestmodrunner
-%{_bindir}/kwrapper
-%{_bindir}/lnusertemp
-%{_bindir}/make_driver_db_cups
-%{_bindir}/make_driver_db_lpr
-%{_bindir}/makekdewidgets
-%{_bindir}/meinproc
-%{_bindir}/preparetips
-%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
+%{_bindir}/*
 %attr(4755,root,root) %{_bindir}/kgrantpty
-%{_bindir}/start_kdeinit
 %{_libdir}/lib*.so.*
 %{_libdir}/libkdeinit_*.so
 %{_libdir}/lib*.la
 %{_libdir}/kde3/
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/*
-%{_datadir}/locale/all_languages
 %config(noreplace) %{_datadir}/config/*
-%{_datadir}/emoticons/*
-%{_datadir}/icons/crystalsvg/
-%{_datadir}/icons/default.kde
 %{_datadir}/mimelnk/magic
 %{_datadir}/mimelnk/*/*.desktop
-%{_datadir}/autostart/*
 %{_datadir}/services/*
-%ghost %{_datadir}/services/ksycoca
 %{_datadir}/servicetypes/*
+%ghost %{_datadir}/services/ksycoca
+%if "%{name}" == "kdelibs"
+%{_sysconfdir}/kde/xdg/menus/*.menu
+%{_sysconfdir}/xdg/menus/*.menu
+%attr(4755,root,root) %{_bindir}/kpac_dhcp_helper
+%{_datadir}/autostart/*
+%{_datadir}/emoticons/*
+%{_datadir}/icons/crystalsvg/
+%{_datadir}/icons/default.kde
+%{_datadir}/locale/all_languages
 %{_docdir}/HTML/en/common
 %{_docdir}/HTML/en/kspell
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -466,7 +436,7 @@
 %{_libdir}/lib*.a
 %exclude %{_libdir}/libkdeinit_*.so
 
-%if %{apidocs}
+%if "%{?apidocs}" == "1"
 %files apidocs
 %defattr(-,root,root,-)
 %{_docdir}/%{name}-devel-%{kde_major_version}
@@ -475,8 +445,9 @@
 
 
 %changelog
-* Wed Jul 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-12
+* Wed Jul 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-13
 - build fails against cups-1.3 (#248717)
+- incorporate kdelibs3 bits (not enabled... yet) 
 
 * Wed Jul 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 6:3.5.7-10
 - +Requires: kde-filesystem


--- kdelibs-3.5.7-ICEauthority.patch DELETED ---




More information about the scm-commits mailing list