rpms/kdenetwork/F-10 kdenetwork-4.2.98-kdrc-icon.patch, NONE, 1.1 .cvsignore, 1.63, 1.64 kdenetwork.spec, 1.172, 1.173 sources, 1.73, 1.74 kdenetwork-4.1.96-system-libgadu.patch, 1.1, NONE kdenetwork-4.2.0-kopete-view-history.patch, 1.1, NONE kdenetwork-4.2.0-libv4l.patch, 1.1, NONE kdenetwork-4.2.4-kopete-ymsg16.patch, 1.1, NONE kdenetwork-4.3.0-krdc-fullscreen-icons.patch, 1.1, NONE
Rex Dieter
rdieter at fedoraproject.org
Wed Aug 5 13:01:17 UTC 2009
- Previous message (by thread): rpms/kdenetwork/devel kdenetwork.spec,1.194,1.195
- Next message (by thread): rpms/kdenetwork/F-11 kdenetwork-4.2.98-kdrc-icon.patch, NONE, 1.1 .cvsignore, 1.67, 1.68 kdenetwork.spec, 1.190, 1.191 sources, 1.74, 1.75 kdenetwork-4.1.96-system-libgadu.patch, 1.1, NONE kdenetwork-4.2.0-kopete-view-history.patch, 1.1, NONE kdenetwork-4.2.0-libv4l.patch, 1.1, NONE kdenetwork-4.2.4-kopete-ymsg16.patch, 1.1, NONE kdenetwork-4.3.0-krdc-fullscreen-icons.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rdieter
Update of /cvs/pkgs/rpms/kdenetwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12919/F-10
Modified Files:
.cvsignore kdenetwork.spec sources
Added Files:
kdenetwork-4.2.98-kdrc-icon.patch
Removed Files:
kdenetwork-4.1.96-system-libgadu.patch
kdenetwork-4.2.0-kopete-view-history.patch
kdenetwork-4.2.0-libv4l.patch
kdenetwork-4.2.4-kopete-ymsg16.patch
kdenetwork-4.3.0-krdc-fullscreen-icons.patch
Log Message:
kde-4.3.0
kdenetwork-4.2.98-kdrc-icon.patch:
CMakeLists.txt | 4 ++++
1 file changed, 4 insertions(+)
--- NEW FILE kdenetwork-4.2.98-kdrc-icon.patch ---
diff -up kdenetwork-4.2.98/krdc/CMakeLists.txt.me kdenetwork-4.2.98/krdc/CMakeLists.txt
--- kdenetwork-4.2.98/krdc/CMakeLists.txt.me 2009-06-17 22:08:12.000000000 +0200
+++ kdenetwork-4.2.98/krdc/CMakeLists.txt 2009-07-24 14:26:34.000000000 +0200
@@ -73,6 +73,8 @@ kde4_add_ui_files(krdc_SRCS
config/general.ui
)
+kde4_add_app_icon(krdc_SRCS "hi*-apps-krdc.png")
+
kde4_add_executable(krdc ${krdc_SRCS})
target_link_libraries(krdc
@@ -93,3 +95,5 @@ install(FILES pointcursor.png pointcurso
if(NOT INSIDE_KDENETWORK)
macro_display_feature_log()
endif(NOT INSIDE_KDENETWORK)
+
+kde4_install_icons( ${ICON_INSTALL_DIR} )
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-10/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore 30 May 2009 14:10:54 -0000 1.63
+++ .cvsignore 5 Aug 2009 13:01:16 -0000 1.64
@@ -1 +1,6 @@
-kdenetwork-4.2.4.tar.bz2
+kdenetwork-4.2.90.tar.bz2
+kdenetwork-4.2.95.tar.bz2
+kdenetwork-4.2.96.tar.bz2
+kdenetwork-4.2.98.tar.bz2
+krdc-icons.tar.bz2
+kdenetwork-4.3.0.tar.bz2
Index: kdenetwork.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-10/kdenetwork.spec,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -p -r1.172 -r1.173
--- kdenetwork.spec 7 Jul 2009 10:38:31 -0000 1.172
+++ kdenetwork.spec 5 Aug 2009 13:01:17 -0000 1.173
@@ -1,25 +1,18 @@
Summary: K Desktop Environment - Network Applications
Name: kdenetwork
Epoch: 7
-Version: 4.2.4
-Release: 4%{?dist}
+Version: 4.3.0
+Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.kde.org
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-Patch1: kdenetwork-4.2.0-libv4l.patch
+Source1: krdc-icons.tar.bz2
-# 4.2 upstream patches
-# implement YMSG 16 protocol to allow logging into Yahoo! again (Matt Rogers)
-Patch100: kdenetwork-4.2.4-kopete-ymsg16.patch
-
-# build Kopete against the system libgadu (backported from 4.3)
-# http://websvn.kde.org/?view=rev&revision=909144
-# http://websvn.kde.org/?view=rev&revision=909145
-Patch200: kdenetwork-4.1.96-system-libgadu.patch
-Patch201: kdenetwork-4.2.0-kopete-view-history.patch
-Patch202: kdenetwork-4.3.0-krdc-fullscreen-icons.patch
+## upstream me! -- Rex :)
+Patch1: kdenetwork-4.2.98-kdrc-icon.patch
+# upstream patches (4.3 branch):
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,6 +23,7 @@ BuildRequires: boost-devel
BuildRequires: giflib-devel
BuildRequires: glib2-devel
BuildRequires: gmp-devel
+BuildRequires: kdelibs-experimental >= %{version}
BuildRequires: kdepimlibs-devel >= %{version}
BuildRequires: libgadu-devel >= 1.8.0
BuildRequires: libidn-devel
@@ -53,6 +47,7 @@ BuildRequires: libv4l-devel
Requires: kdepimlibs >= %{version}
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: mozilla-filesystem
# kopete/yahoo
Requires(hint): jasper
@@ -93,21 +88,19 @@ Requires: kdelibs4-devel
%prep
-%setup -q
-%patch1 -p1 -b .libv4l
-# 4.2 upstream patches
-%patch100 -p0 -b .kopete-ymsg16
-chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
+%setup -q -a 1
+%patch1 -p1 -b .icon
+
# 4.3 upstream patches
-%patch200 -p0 -b .system-libgadu
-rm -rf kopete/protocols/gadu/libgadu/
-%patch201 -p1 -b .kopete-view-history
-%patch202 -p1 -b .krdc-fullscreen-icons
+chmod +x kopete/kopete/kconf_update/kopete-update_yahoo_server.pl
+
%build
mkdir -p %{_target_platform}
pushd %{_target_platform}
-%{cmake_kde4} ..
+%{cmake_kde4} \
+ -DMOZPLUGIN_INSTALL_DIR=%{_libdir}/mozilla/plugins \
+ ..
popd
make %{?_smp_mflags} -C %{_target_platform}
@@ -170,7 +163,8 @@ fi
%{_kde4_docdir}/HTML/en/*/
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_iconsdir}/oxygen/*/*/*
-%{_kde4_libdir}/kde4/*
+%{_kde4_libdir}/kde4/*.so
+%{_libdir}/mozilla/plugins/libskypebuttons.so
%files libs
%defattr(-,root,root,-)
@@ -180,25 +174,35 @@ fi
%files devel
%defattr(-,root,root,-)
%{_kde4_includedir}/kopete/
+%{_kde4_includedir}/krdc/
%{_kde4_libdir}/lib*.so
%exclude %{_kde4_libdir}/libqgroupwise.so
%changelog
-* Tue Jul 7 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-4
-- #505237 - Upstream patch for KRDC full screen icons
+* Thu Jul 30 2009 Than Ngo <than at redhat.com> - 4.3.0-1
+- 4.3.0
-* Thu Jun 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.4-3
-- implement YMSG 16 protocol to allow logging into Yahoo! again (upstream patch)
+* Wed Jul 22 2009 Than Ngo <than at redhat.com> - 4.2.98-1
+- 4.3rc3
-* Mon Jun 1 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-2
-- respun tarball
+* Sat Jul 11 2009 Than Ngo <than at redhat.com> - 4.2.96-1
+- 4.3rc2
+
+* Fri Jun 26 2009 Than Ngo <than at redhat.com> - 4.2.95-1
+- 4.3rc1
+
+* Thu Jun 25 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-3
+- BR: kdelibs-experimental
+
+* Thu Jun 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.90-2
+- implement YMSG 16 protocol to allow logging into Yahoo! again (upstream patch)
-* Sat May 30 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.4-1
-- KDE 4.2.4
+* Thu Jun 04 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.90-1
+- KDE-4.3 beta2 (4.2.90)
-* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-1
-- 4.2.3
+* Wed May 13 2009 Lukáš Tinkl <ltinkl at redhat.com> - 4.2.85-1
+- KDE 4.3 beta 1
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
- optimize scriptlets
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdenetwork/F-10/sources,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- sources 1 Jun 2009 11:52:31 -0000 1.73
+++ sources 5 Aug 2009 13:01:17 -0000 1.74
@@ -1 +1,2 @@
-3071bbb1a24c62b81593e76187a84fb6 kdenetwork-4.2.4.tar.bz2
+7dd360a790100c952090410c2c89937c krdc-icons.tar.bz2
+f9695ff06d0d67a78a71fb9b3ddbd4f3 kdenetwork-4.3.0.tar.bz2
--- kdenetwork-4.1.96-system-libgadu.patch DELETED ---
--- kdenetwork-4.2.0-kopete-view-history.patch DELETED ---
--- kdenetwork-4.2.0-libv4l.patch DELETED ---
--- kdenetwork-4.2.4-kopete-ymsg16.patch DELETED ---
--- kdenetwork-4.3.0-krdc-fullscreen-icons.patch DELETED ---
- Previous message (by thread): rpms/kdenetwork/devel kdenetwork.spec,1.194,1.195
- Next message (by thread): rpms/kdenetwork/F-11 kdenetwork-4.2.98-kdrc-icon.patch, NONE, 1.1 .cvsignore, 1.67, 1.68 kdenetwork.spec, 1.190, 1.191 sources, 1.74, 1.75 kdenetwork-4.1.96-system-libgadu.patch, 1.1, NONE kdenetwork-4.2.0-kopete-view-history.patch, 1.1, NONE kdenetwork-4.2.0-libv4l.patch, 1.1, NONE kdenetwork-4.2.4-kopete-ymsg16.patch, 1.1, NONE kdenetwork-4.3.0-krdc-fullscreen-icons.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list