[pidgin/f14] (4 commits) ...Merge branch 'master' into f14
by Stu Tomlinson
Summary of changes:
b91f440... Perl mass rebuild (*)
b3eaafe... Rebuild against new evolution-data-server (*)
67216ee... - 2.9.0, includes security/DoS fix to work around gdk-pixbu (*)
0941efb... Merge branch 'master' into f14
(*) This commit already existed in another branch; no separate mail sent
11Â years, 7Â months
[pidgin/f15: 4/4] Merge branch 'master' into f15
by Stu Tomlinson
commit c7e436b3e65ed9d1824ba8ca3ac386b6b126ad9e
Merge: f902d8f 67216ee
Author: Stu Tomlinson <stu(a)nosnilmot.com>
Date: Thu Jun 30 21:33:45 2011 +0100
Merge branch 'master' into f15
.gitignore | 1 +
pidgin.spec | 12 +++++++++++-
sources | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
---
11Â years, 7Â months
[pidgin/f15] (4 commits) ...Merge branch 'master' into f15
by Stu Tomlinson
Summary of changes:
b91f440... Perl mass rebuild (*)
b3eaafe... Rebuild against new evolution-data-server (*)
67216ee... - 2.9.0, includes security/DoS fix to work around gdk-pixbu (*)
c7e436b... Merge branch 'master' into f15
(*) This commit already existed in another branch; no separate mail sent
11Â years, 7Â months
[pidgin] - 2.9.0, includes security/DoS fix to work around gdk-pixbuf issue CVE-2011-2485
by Stu Tomlinson
commit 67216eee1842ad5cbd0a64efc7f2167697b5aa0e
Author: Stu Tomlinson <stu(a)nosnilmot.com>
Date: Thu Jun 30 21:32:19 2011 +0100
- 2.9.0, includes security/DoS fix to work around gdk-pixbuf issue
CVE-2011-2485
.gitignore | 1 +
pidgin.spec | 8 ++++++--
sources | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a2122e8..64fa347 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ pidgin-2.7.3.tar.bz2
/pidgin-2.7.10.tar.bz2
/pidgin-2.7.11.tar.bz2
/pidgin-2.8.0.tar.bz2
+/pidgin-2.9.0.tar.bz2
diff --git a/pidgin.spec b/pidgin.spec
index 70801be..abfe5ac 100644
--- a/pidgin.spec
+++ b/pidgin.spec
@@ -97,8 +97,8 @@
%endif
Name: pidgin
-Version: 2.8.0
-Release: 3%{?dist}
+Version: 2.9.0
+Release: 1%{?dist}
License: GPLv2+ and GPLv2 and MIT
# GPLv2+ - libpurple, gnt, finch, pidgin, most prpls
# GPLv2 - silc & novell prpls
@@ -683,6 +683,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Thu Jun 30 2011 Stu Tomlinson <stu(a)nosnilmot.com> 2.8.0-3
+- 2.9.0, includes security/DoS fix to work around gdk-pixbuf issue
+ CVE-2011-2485
+
* Mon Jun 20 2011 Milan Crha <mcrha(a)redhat.com> 2.8.0-3
- Rebuild against new evolution-data-server
diff --git a/sources b/sources
index 90fdb3f..60f8017 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d1656c443a5d91f4aa0d95915f1f50c3 pidgin-2.8.0.tar.bz2
+2cd285c7a40f93b7a51bfe733971d3a6 pidgin-2.9.0.tar.bz2
11Â years, 7Â months
[kde-l10n] drop kdepim pieces fix %%files Slovenian
by Rex Dieter
commit 0f9b923ce6c5e3254d7aa90ea765e5d5dcb21978
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Thu Jun 30 15:31:41 2011 -0500
drop kdepim pieces
fix %%files Slovenian
kde-l10n.spec | 34 ----------------------------------
sources | 1 -
2 files changed, 0 insertions(+), 35 deletions(-)
---
diff --git a/kde-l10n.spec b/kde-l10n.spec
index 799d86e..1cfdd40 100644
--- a/kde-l10n.spec
+++ b/kde-l10n.spec
@@ -1,10 +1,6 @@
%define buildall 0
-%if 0%{?fedora} < 16
-%define kdepim44 1
-%endif
-
Name: kde-l10n
Version: 4.6.90
Release: 1%{?dist}
@@ -74,8 +70,6 @@ Source80: ftp://ftp.kde.org/pub/src/unstable/%{version}/src/kde-l10n/%{name}-uk-
Source81: ftp://ftp.kde.org/pub/src/unstable/%{version}/src/kde-l10n/%{name}-wa-%{v...
Source82: ftp://ftp.kde.org/pub/src/unstable/%{version}/src/kde-l10n/%{name}-zh_CN-...
Source83: ftp://ftp.kde.org/pub/src/unstable/%{version}/src/kde-l10n/%{name}-zh_TW-...
-# copy from kde-l10n-4.4.5, it only contains kdepim translations
-Source500: kde-l10n-kdepim-4.4.5.tar.bz2
Source1000: subdirs-kde-l10n
@@ -85,14 +79,6 @@ BuildRequires: gettext
BuildRequires: kdelibs4-devel >= %{version}
Requires: kde-filesystem
-%if 0%{?kdepim44}
-#Conflicts: kdepim4 > 4.5.90
-#Conflicts: kdepim4-runtime > 4.5.90
-## or
-Conflicts: kde-l10n-kdepim > 4.5.90
-Conflicts: kde-l10n-kdepim-runtime > 4.5.90
-Provides: kde-l10n-kdepim = 4.4.5-1
-%endif
# klickety moved kde-i18n -> kde-l10n (#656523)
Conflicts: kde-i18n < 1:3.5.10-13
@@ -791,17 +777,8 @@ done
# upstream patches
-%if 0%{?kdepim44}
-bzip2 -dc %{SOURCE500} | tar -xf -
-%endif
-
-
%build
for i in $(cat %{SOURCE1000}) ; do
- if [ -d "%{name}-$i-%{version}" -a -d "kde-l10n-4.4.5/kde-l10n-$i-4.4.5" ]; then
- cp -a kde-l10n-4.4.5/kde-l10n-$i-4.4.5/* %{name}-$i-%{version}/
- rm -rfv kde-l10n-4.4.5/kde-l10n-$i-4.4.5
- fi
if [ -d "%{name}-$i-%{version}" ]; then
pushd %{name}-$i-%{version}
for j in . *@* ; do
@@ -811,14 +788,6 @@ for i in $(cat %{SOURCE1000}) ; do
if [ -e $j/docs/CMakeLists.txt ] ; then
sed -i -e 's/add_subdirectory( *kdewebdev *)/#add_subdirectory(kdewebdev)/g' $j/docs/CMakeLists.txt
fi
-%if !0%{?kdepim44}
- # kdepim(-runtime) 4.6 includes its own translations, so blacklist
- # kdepim-runtime translations included here by accident
- sed -i -e 's/add_subdirectory( *kdepim-runtime *)/#add_subdirectory(kdepim-runtime)/g' $j/messages/CMakeLists.txt
- if [ -e $j/docs/CMakeLists.txt ] ; then
- sed -i -e 's/add_subdirectory( *kdepim-runtime *)/#add_subdirectory(kdepim-runtime)/g' $j/docs/CMakeLists.txt
- fi
-%endif
# remove lilo-config, conflicts with 3.5.10
rm -f $j/messages/kdeadmin/kcmlilo.po
if [ -e $j/docs/kdeadmin/CMakeLists.txt ] ; then
@@ -1436,9 +1405,6 @@ rm -rf %{buildroot}
%lang(sl) %{_kde4_appsdir}/ktuberling/sounds/sl*
%lang(sl) %{_kde4_appsdir}/khangman/sl.txt
%lang(sl) %{_kde4_appsdir}/kvtml/sl/
-%lang(sl) %{_kde4_appsdir}/katepart/syntax/logohighlightstyle.sl.xml
-%lang(sl) %{_kde4_appsdir}/kturtle/data/logokeywords.sl.xml
-%lang(sl) %{_kde4_appsdir}/kturtle/examples/sl/*.logo
%lang(sl) %{_kde4_docdir}/HTML/sl/*
%files Serbian
diff --git a/sources b/sources
index 999c3bb..06ae313 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,3 @@
-24952d788935fd32ffbe70e8e2bada1f kde-l10n-kdepim-4.4.5.tar.bz2
b370ffecfec8da16e894b70ef139138c kde-l10n-ar-4.6.90.tar.bz2
ae4f8f3c5279e21e00a63a03c2d15d0f kde-l10n-bg-4.6.90.tar.bz2
b83424af7b763c4c0029fa4c754093c0 kde-l10n-ca-4.6.90.tar.bz2
11Â years, 7Â months
[kdepim-runtime] 4.6.90
by Rex Dieter
commit 2bb1e041f7f207abeb5654bec306a723bb0c7992
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Thu Jun 30 15:24:35 2011 -0500
4.6.90
.gitignore | 2 +-
kdepim-runtime.spec | 25 ++++++++++++++++---------
sources | 2 +-
3 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9bf76e4..72f6659 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/kdepim-runtime-4.6.0.tar.bz2
+/kdepim-runtime-4.6.90.tar.bz2
diff --git a/kdepim-runtime.spec b/kdepim-runtime.spec
index 3f17349..f3fe116 100644
--- a/kdepim-runtime.spec
+++ b/kdepim-runtime.spec
@@ -2,29 +2,30 @@
Name: kdepim-runtime
Summary: KDE PIM Runtime Environment
Epoch: 1
-Version: 4.6.0
+Version: 4.6.90
Release: 1%{?dist}
License: GPLv2
Group: Applications/Productivity
URL: http://www.kde.org/
-Source0: ftp://ftp.kde.org/pub/kde/stable/kdepim-%{version}/src/kdepim-runtime-%{v...
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepim-runtime-%{versio...
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# show the Akonadi KCM in System Settings (#565420)
Patch0: kdepim-runtime-4.4.93-show_akonadi_kcm.patch
Provides: kdepim4-runtime = %{version}-%{release}
-Provides: kde-l10n-kdepim-runtime = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}
Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
-BuildRequires: akonadi-devel >= 1.5.0
+BuildRequires: akonadi-devel >= 1.5.80
+%global akonadi_version_min 1.5.80
%global akonadi_version %(pkg-config --modversion akonadi 2>/dev/null || echo %{akonadi_version_min})
+BuildRequires: akonadi-devel >= %{akonadi_version_min}
BuildRequires: desktop-file-utils
BuildRequires: gettext
-BuildRequires: kdepimlibs-devel >= 4.5.95
+BuildRequires: kdepimlibs-devel >= %{version}
BuildRequires: libxslt-devel libxml2-devel
BuildRequires: shared-desktop-ontologies
BuildRequires: soprano-devel
@@ -77,8 +78,6 @@ rm -rf %{buildroot}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-%find_lang %{name} --all-name --with-kde
-
%check
for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
@@ -111,7 +110,7 @@ fi
rm -rf %{buildroot}
-%files -f %{name}.lang
+%files
%defattr(-,root,root,-)
%{_kde4_bindir}/*
%{_kde4_libdir}/kde4/*.so
@@ -121,7 +120,12 @@ rm -rf %{buildroot}
%{_kde4_datadir}/autostart/kaddressbookmigrator.desktop
%{_kde4_datadir}/config/*rc
%{_kde4_datadir}/dbus-1/interfaces/*.xml
-%{_kde4_datadir}/kde4/services/*
+%{_kde4_datadir}/kde4/services/*.desktop
+%{_kde4_datadir}/kde4/services/*.protocol
+%{_kde4_datadir}/kde4/services/akonadi/davgroupware-providers/
+%{_kde4_datadir}/kde4/services/kresources/kabc/*.desktop
+%{_kde4_datadir}/kde4/services/kresources/kcal/*.desktop
+%{_kde4_datadir}/kde4/servicetypes/*.desktop
%{_kde4_datadir}/mime/packages/*.xml
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_appsdir}/akonadi/
@@ -138,6 +142,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Jun 30 2011 Rex Dieter <rdieter(a)fedoraproject.org> 1:4.6.90-1
+- 4.6.90
+
* Fri Jun 10 2011 Rex Dieter <rdieter(a)fedoraproject.org> 1:4.6.0-1
- 4.6.0
diff --git a/sources b/sources
index 241655e..0b82ac0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b7b5409cb22d57bd817a6d653f714bd7 kdepim-runtime-4.6.0.tar.bz2
+c2d9e470f4614277e4e0ecd46fcec5ba kdepim-runtime-4.6.90.tar.bz2
11Â years, 7Â months
[petit/el5] New upstream version 1.1.1
by Sandro "red" Mathys
commit 93345d69326cfcaece676cd6f363621516472ecd
Author: Sandro Mathys <red(a)fedoraproject.org>
Date: Thu Jun 30 22:09:27 2011 +0200
New upstream version 1.1.1
.gitignore | 1 +
petit.spec | 15 +++++++++------
sources | 2 +-
3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 83309ca..967769b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ petit-1.0.0.tgz
/petit-1.0.3.tgz
/petit-1.0.3.patch
/petit-1.1.0.tgz
+/petit-1.1.1.tgz
diff --git a/petit.spec b/petit.spec
index faf85d7..aa36abb 100644
--- a/petit.spec
+++ b/petit.spec
@@ -1,5 +1,5 @@
Name: petit
-Version: 1.1.0
+Version: 1.1.1
Release: 1%{?dist}
Summary: Log analysis tool for syslog, Apache and raw log files
@@ -67,17 +67,20 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jun 30 2011 Sandro Mathys <red at fedoraproject.org> - 1.1.1-1
+- New upstream version 1.1.1
+
* Tue Nov 09 2010 Sandro Mathys <red at fedoraproject.org> - 1.1.0-1
-- new upstream version
+- New upstream version 1.1.0
* Mon Nov 08 2010 Sandro Mathys <red at fedoraproject.org> - 1.0.3-2
-- added fix for rhbz#651018
+- Added fix for rhbz#651018
* Wed Oct 20 2010 Sandro Mathys <red at fedoraproject.org> - 1.0.3-1
-- new upstream version
+- New upstream version 1.0.3
* Wed Aug 11 2010 David Malcolm <dmalcolm(a)redhat.com> - 1.0.0-2
-- recompiling .py files against Python 2.7 (rhbz#623345)
+- Recompiling .py files against Python 2.7 (rhbz#623345)
* Sun Mar 07 2010 Sandro Mathys <red at fedoraproject.org> - 1.0.0-1
-- initial package
+- Initial package
diff --git a/sources b/sources
index bf73648..e607bd7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65ac72683ec35cf2e5774c726d85dda6 petit-1.1.0.tgz
+6eec1f5e9e3f24a6a709419a86e6ef85 petit-1.1.1.tgz
11Â years, 7Â months
[mingw32-sigar/f15] (3 commits) ...- Upload sources
by Adam Stokes
Summary of changes:
784919c... - Pull upstream source (*)
4ede7f5... - Bump spec release (*)
6cc86a5... - Upload sources (*)
(*) This commit already existed in another branch; no separate mail sent
11Â years, 7Â months
[petit/el6] New upstream version 1.1.1
by Sandro "red" Mathys
commit b5f0a582f46de953f7ec33c48621364ef805ef24
Author: Sandro Mathys <red(a)fedoraproject.org>
Date: Thu Jun 30 22:04:07 2011 +0200
New upstream version 1.1.1
.gitignore | 1 +
petit.spec | 15 +++++++++------
sources | 2 +-
3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 83309ca..967769b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ petit-1.0.0.tgz
/petit-1.0.3.tgz
/petit-1.0.3.patch
/petit-1.1.0.tgz
+/petit-1.1.1.tgz
diff --git a/petit.spec b/petit.spec
index faf85d7..aa36abb 100644
--- a/petit.spec
+++ b/petit.spec
@@ -1,5 +1,5 @@
Name: petit
-Version: 1.1.0
+Version: 1.1.1
Release: 1%{?dist}
Summary: Log analysis tool for syslog, Apache and raw log files
@@ -67,17 +67,20 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jun 30 2011 Sandro Mathys <red at fedoraproject.org> - 1.1.1-1
+- New upstream version 1.1.1
+
* Tue Nov 09 2010 Sandro Mathys <red at fedoraproject.org> - 1.1.0-1
-- new upstream version
+- New upstream version 1.1.0
* Mon Nov 08 2010 Sandro Mathys <red at fedoraproject.org> - 1.0.3-2
-- added fix for rhbz#651018
+- Added fix for rhbz#651018
* Wed Oct 20 2010 Sandro Mathys <red at fedoraproject.org> - 1.0.3-1
-- new upstream version
+- New upstream version 1.0.3
* Wed Aug 11 2010 David Malcolm <dmalcolm(a)redhat.com> - 1.0.0-2
-- recompiling .py files against Python 2.7 (rhbz#623345)
+- Recompiling .py files against Python 2.7 (rhbz#623345)
* Sun Mar 07 2010 Sandro Mathys <red at fedoraproject.org> - 1.0.0-1
-- initial package
+- Initial package
diff --git a/sources b/sources
index bf73648..e607bd7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65ac72683ec35cf2e5774c726d85dda6 petit-1.1.0.tgz
+6eec1f5e9e3f24a6a709419a86e6ef85 petit-1.1.1.tgz
11Â years, 7Â months