[mutter] Update to 3.0.1
by Owen Taylor
commit 7dfc29b35857e961ba70073638db3f92e205455e
Author: Owen W. Taylor <otaylor(a)fishsoup.net>
Date: Thu Jun 30 17:13:57 2011 -0400
Update to 3.0.1
.gitignore | 1 +
mutter.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 57a986f..72b1516 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ mutter-2.31.5.tar.bz2
/mutter-3.0.0.tar.bz2
/mutter-3.0.1.tar.bz2
/mutter-3.0.2.1.tar.bz2
+/mutter-3.1.3.tar.bz2
diff --git a/mutter.spec b/mutter.spec
index 0d17ed8..07be8ae 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -1,5 +1,5 @@
Name: mutter
-Version: 3.0.2.1
+Version: 3.1.3
Release: 1%{?dist}
Summary: Window and compositing manager based on Clutter
@@ -143,6 +143,9 @@ gconftool-2 --makefile-install-rule \
%doc %{_mandir}/man1/mutter-window-demo.1.gz
%changelog
+* Thu Jun 30 2011 Owen Taylor <otaylor(a)redhat.com> - 3.1.3-1
+- Update to 3.1.3
+
* Wed May 25 2011 Owen Taylor <otaylor(a)redhat.com> - 3.0.2.1-1
- Update to 3.0.2.1
diff --git a/sources b/sources
index ec05139..4205a6d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-52212e032309fff6307f9083171fcb1a mutter-3.0.2.1.tar.bz2
+ae3c93474052dba782b7df9a54d1b40c mutter-3.1.3.tar.bz2
11Â years, 7Â months
[mutter] Update to 3.0.2.1
by Owen Taylor
commit aec6fe807a3fdfd24cecb1c1e303a0130ee984d1
Author: Owen W. Taylor <otaylor(a)fishsoup.net>
Date: Wed May 25 16:13:37 2011 -0400
Update to 3.0.2.1
.gitignore | 1 +
libmutter-session-save.patch | 51 ------------------------------------------
mutter.spec | 11 ++++-----
sources | 2 +-
4 files changed, 7 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e6f4957..57a986f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ mutter-2.31.5.tar.bz2
/mutter-2.91.93.tar.bz2
/mutter-3.0.0.tar.bz2
/mutter-3.0.1.tar.bz2
+/mutter-3.0.2.1.tar.bz2
diff --git a/mutter.spec b/mutter.spec
index d748bc0..0d17ed8 100644
--- a/mutter.spec
+++ b/mutter.spec
@@ -1,6 +1,6 @@
Name: mutter
-Version: 3.0.1
-Release: 3%{?dist}
+Version: 3.0.2.1
+Release: 1%{?dist}
Summary: Window and compositing manager based on Clutter
Group: User Interface/Desktops
@@ -8,9 +8,6 @@ License: GPLv2+
#VCS: git:git://git.gnome.org/mutter
Source0: ftp://ftp.gnome.org/pub/gnome/sources/%{name}/3.0/%{name}-%{version}.tar.bz2
-# upstream fix
-Patch0: libmutter-session-save.patch
-
BuildRequires: clutter-devel >= 1.5.8
BuildRequires: pango-devel
BuildRequires: startup-notification-devel
@@ -63,7 +60,6 @@ utilities for testing Metacity/Mutter themes.
%prep
%setup -q
-%patch0 -p1 -b .session-save
%build
(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; fi;
@@ -147,6 +143,9 @@ gconftool-2 --makefile-install-rule \
%doc %{_mandir}/man1/mutter-window-demo.1.gz
%changelog
+* Wed May 25 2011 Owen Taylor <otaylor(a)redhat.com> - 3.0.2.1-1
+- Update to 3.0.2.1
+
* Fri Apr 29 2011 Matthias Clasen <mclasen(a)redhat.com> - 3.0.1-3
- Actually apply the patch for #700276
diff --git a/sources b/sources
index a2e98d3..ec05139 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b0becf3994d279dae28a898d0e74d018 mutter-3.0.1.tar.bz2
+52212e032309fff6307f9083171fcb1a mutter-3.0.2.1.tar.bz2
11Â years, 7Â months
[kdepim] 4.6.90
by Rex Dieter
commit cc7027cd9de9180c59cebc9fa4e604557dcb479c
Author: Rex Dieter <rdieter(a)fedoraproject.org>
Date: Thu Jun 30 15:59:37 2011 -0500
4.6.90
.gitignore | 1 +
kdepim.spec | 28 ++++++++++------------------
sources | 2 +-
3 files changed, 12 insertions(+), 19 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f7c67fa..ef0a86b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/kdepim-4.6.0.tar.bz2
+/kdepim-4.6.90.tar.bz2
diff --git a/kdepim.spec b/kdepim.spec
index 19768d8..1c7b617 100644
--- a/kdepim.spec
+++ b/kdepim.spec
@@ -2,13 +2,13 @@
Name: kdepim
Summary: KDE PIM (Personal Information Manager) applications
Epoch: 7
-Version: 4.6.0
-Release: 2%{?dist}
+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-%{version}%...
+Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdepim-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# revert http://websvn.kde.org/?view=revision&revision=1072331 (rebased to 4.6)
@@ -16,19 +16,14 @@ Patch0: kdepim-4.5.85-install-headers.patch
# upstream patches
-Obsoletes: bilbo < 1:1.0
-
Provides: kdepim4 = %{version}-%{release}
-# kdepim includes it's own translations now (vs. kdepim-4.4.x)
-Provides: kde-l10n-kdepim = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: kdebase-runtime%{?_kde4_version: >= %{_kde4_version}}
# beware bootstrapping (ie, build kdepim-runtime first)
Requires: kdepim4-runtime >= %{version}
-BuildRequires: akonadi-devel >= 1.5.0
-%global akonadi_version %(pkg-config --modversion akonadi 2>/dev/null || echo '1.4.95')
+BuildRequires: akonadi-devel >= 1.5.80
BuildRequires: bison flex
BuildRequires: boost-devel
BuildRequires: chrpath
@@ -37,8 +32,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gettext
BuildRequires: gpgme-devel
BuildRequires: grantlee-devel
-BuildRequires: kdepimlibs-devel >= 4.5.95
-# aka libassuan-devel >= 2.0.0
+BuildRequires: kdepimlibs-devel >= %{version}
BuildRequires: libassuan2-devel
BuildRequires: libical-devel
BuildRequires: libXpm-devel libXScrnSaver-devel
@@ -74,10 +68,7 @@ Requires: spambayes
Summary: %{name} runtime libraries
Group: System Environment/Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
-## these two should already be included in kdepim-runtime, so let's leave
-## them out here for now -- Rex
-#Requires: akonadi%{?_isa} >= %{akonadi_version}
-#%{?_kde4_version:Requires: kdepimlibs-akonadi%{?_isa} >= %{_kde4_version}}
+#{?_kde4_version:Requires: kdepimlibs-akonadi%{?_isa} >= %{_kde4_version}}
%description libs
%{summary}.
@@ -115,8 +106,6 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
chrpath --list %{buildroot}%{_kde4_bindir}/kabc2mutt && \
chrpath --delete %{buildroot}%{_kde4_bindir}/kabc2mutt
-%find_lang %{name} --all-name --with-kde
-
%check
for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do
@@ -151,7 +140,7 @@ fi
rm -rf %{buildroot}
-%files -f %{name}.lang
+%files
%defattr(-,root,root,-)
%doc README
%doc COPYING
@@ -209,6 +198,9 @@ rm -rf %{buildroot}
%changelog
+* Thu Jun 30 2011 Rex Dieter <rdieter(a)fedoraproject.org> 7:4.6.90-1
+- 4.6.90
+
* Wed Jun 29 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org> 7:4.6.0-2
- Disable kdepim-mobile until it actually works (#717694)
diff --git a/sources b/sources
index bbb4f34..904507a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-72396ca638233f52fcc69cac74fcc06d kdepim-4.6.0.tar.bz2
+4f881030b6e752600c6cecf57a7f826c kdepim-4.6.90.tar.bz2
11Â years, 7Â months
[pidgin/f14: 4/4] Merge branch 'master' into f14
by Stu Tomlinson
commit 0941efbc841beb0f10c616cd84d4b6f8d1b5af1e
Merge: 80e19aa 67216ee
Author: Stu Tomlinson <stu(a)nosnilmot.com>
Date: Thu Jun 30 21:34:49 2011 +0100
Merge branch 'master' into f14
.gitignore | 1 +
pidgin.spec | 12 +++++++++++-
sources | 2 +-
3 files changed, 13 insertions(+), 2 deletions(-)
---
11Â years, 7Â months