rpms/cairo-dock/devel .cvsignore, 1.11, 1.12 cairo-dock.spec, 1.17, 1.18 sources, 1.13, 1.14
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9652
Modified Files:
.cvsignore cairo-dock.spec sources
Log Message:
* Sun May 17 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.1-1
- 2.0.1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 10 May 2009 02:00:17 -0000 1.11
+++ .cvsignore 17 May 2009 14:04:05 -0000 1.12
@@ -1,2 +1,2 @@
-cairo-dock-2.0.0.tar.bz2
-cairo-dock-plugins-2.0.0.tar.bz2
+cairo-dock-2.0.1.tar.bz2
+cairo-dock-plugins-2.0.1.tar.bz2
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- cairo-dock.spec 11 May 2009 13:04:00 -0000 1.17
+++ cairo-dock.spec 17 May 2009 14:04:05 -0000 1.18
@@ -7,26 +7,22 @@
# tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 .
%global released 1
+%undefine pre_release
# Set the below to 1 when building unstable plug-ins
%global build_other 1
-%global mainver 2.0.0
+%global mainver 2.0.1
%undefine betaver
-%global tarballver svn1739_trunk
%global build_themes 0
%global build_webkit 1
%global build_xfce 1
-%global fedora_main_rel 2.respin1
+%global fedora_main_rel 1
-%if 0%{?released} < 1
-%global fedora_rel 0.%{fedora_main_rel}.%{tarballver}
-%else
-%global fedora_rel %{?betaver:0.}%{fedora_main_rel}%{?betaver:.%betaver}
-%endif
+%global fedora_rel %{?pre_release:0.}%{fedora_main_rel}%{?betaver:.%betaver}
%if 0%{?released} >= 1
%global build_other 0
@@ -46,7 +42,7 @@
License: GPLv3+
URL: http://www.cairo-dock.org/
%if 0%{?released} < 1
-Source0: %{name}-sources-%{tarballver}.tar.bz2
+Source0: %{name}-sources-%{betaver}.tar.bz2
%else
Source0: http://download.berlios.de/cairo-dock/%{name}-%{mainver}%{?betaver:-%beta...
%if %{build_themes}
@@ -105,6 +101,7 @@
# in cairo-dock
Requires: findutils
Requires: wget
+Requires: xterm
# Obsoletes moved to main package
# Switch to Webkit, always obsolete gecko (and _not_ provide it)
@@ -624,6 +621,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Sun May 17 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.1-1
+- 2.0.1
+
* Mon May 11 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.0-2.respin1
- Tarballs respun
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 11 May 2009 13:04:00 -0000 1.13
+++ sources 17 May 2009 14:04:05 -0000 1.14
@@ -1,2 +1,2 @@
-cba3f40120d443e92c94cbe6f97cf8a8 cairo-dock-2.0.0.tar.bz2
-32d92984d5f7af36264357f74fe21167 cairo-dock-plugins-2.0.0.tar.bz2
+63795ce39c7092f9dc7ecb024cd186f0 cairo-dock-2.0.1.tar.bz2
+5c29eb3fffb3094324d4a06df2782f2f cairo-dock-plugins-2.0.1.tar.bz2
15 years, 6 months
rpms/rpmfusion-free-release/F-10 RPM-GPG-KEY-rpmfusion-free-fedora-10-primary, NONE, 1.1 RPM-GPG-KEY-rpmfusion-free-fedora-11-primary, NONE, 1.1 RPM-GPG-KEY-rpmfusion-free-fedora-12-primary, NONE, 1.1 rpmfusion-free-rawhide.repo, 1.4, 1.5 rpmfusion-free-release.spec, 1.7, 1.8 rpmfusion-free-updates-testing.repo, 1.3, 1.4 rpmfusion-free-updates.repo, 1.5, 1.6 rpmfusion-free.repo, 1.4, 1.5 RPM-GPG-KEY-rpmfusion-free-fedora, 1.1, NONE
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/rpmfusion-free-release/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9472
Modified Files:
rpmfusion-free-rawhide.repo rpmfusion-free-release.spec
rpmfusion-free-updates-testing.repo
rpmfusion-free-updates.repo rpmfusion-free.repo
Added Files:
RPM-GPG-KEY-rpmfusion-free-fedora-10-primary
RPM-GPG-KEY-rpmfusion-free-fedora-11-primary
RPM-GPG-KEY-rpmfusion-free-fedora-12-primary
Removed Files:
RPM-GPG-KEY-rpmfusion-free-fedora
Log Message:
* Sun May 17 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 10-4
- add key for F12
- some small adjustments to the spec
- add post script that switch old config files from serverside mirrorlists to
mirrormanager
--- NEW FILE RPM-GPG-KEY-rpmfusion-free-fedora-10-primary ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.5 (GNU/Linux)
mQGiBEh43fsRBADXpQLcyRQu1qFrq0C1T94j+wcLVsYcs3Gsiq82jjM7OCDuFGvw
FuWX93V1b0X0L/bnO8fseOsVP4N7ok7UHeuFWfyVT64NBk7pSXMCbYldRIJyJ4o+
KqHgejQEYRCJriJGoFVL53DeXbmlESjytMK1PTZwSX4zKctSUhQaYRmRhwCgufX6
g23aQ4+FS3RywyinvA23mZ0D/iiF/r3U2jKvBk/FgG/0qTaSFsSoBVdvKI5B/HWA
UUIkFewI12sdcwBKVXTzLppul6NyElh5KEY4ls7xadMWRyRl4BU8WzrUyMd0yxem
TqiBjG8s6EO0c2JwebzqBgEmU/nLpkyhEF0xN8trjzhK8lWbAdjnzyzw8xUAF5r0
uyO9BACj6Hyi/mAwLY+aSj58KBtScf3X8e1NSnZTqDoZlOXnm34/Y23Gfwin/RK5
omqa2ZshKNl+8UkPH50Y9x7sRmS2MiiFjuzXQdzLCmLGQMjK/HFUm4a2+byEZXOA
3Pu282Xz5P06/zX+eXTREn1RbBStXVEptWWxLAkqb66Kp4v9OrROUlBNIEZ1c2lv
biByZXBvc2l0b3J5IChGZWRvcmEgLSBmcmVlKSA8cnBtZnVzaW9uLWJ1aWxkc3lz
QGxpc3RzLnJwbWZ1c2lvbi5vcmc+iGAEExECACAFAkh43fsCGwMGCwkIBwMCBBUC
CAMEFgIDAQIeAQIXgAAKCRCFUJmySciIWpd7AJ9LI5/Ae7naPr49NNjQfd1AydJ3
wQCgtf460zaZZeHdzgr2cCg3vmuAPV+5Ag0ESHjeBRAIAIVouFaPtMhROoskFPhS
PA/3nzdi1HlmAYOlzulfAoCjjeo9O+gj6ZPJDJPeO/qG8UWyIn9fAvM+y4Jg32Jy
GWn+lfSHnL+S/ZBJxCgEKl5E2qCGE7nnSyB2HM7aLQzjn58L7JZtlf5EL+Nw/tAC
dfyzHJglteuGl4rrwa7QdWnhTvtmDA7KRDkYrw9A7zSRoH1qyaQkqOhz4YFXI4c+
bGAFBPgiIxu5FRSjMBJJHzrlZtTJx6z+oqCZjP5TLPHrqGbatcum9DmN65LvdV4Y
KMPyMmnTiPRH2YDIC6QleHxPKljol2vxzK2mUvBMr7S0X21i2ImRTXODXMScIZB8
r+sAAwYH/jN63OsS2aPXy9/Tj7bUwSp163O5FVBUtlqdisKECXU/86XlCVbL7wjb
Tn4FxQVPoYfNjzFoi89T4FXcKH3lvQ03vhhG2PNAIyudj/j35Q85xKfSkKBdPIUz
1u5rFMNvCr5cCA3dCFR3bUUykVh1xKvfMluUiZzUZkAQ1Ke/4/GCR9bpwfZDzr3c
RrTveDG1CLw4qakpIzC9KjAJdWMB/voifU1EhWxzt2R7J27c5zvTGvb746nyZUa+
3LBmklUdM4xRZcy25nqSSIwgmGx4Iak0fj0+6cMM47TliDeBNfJpSRb3qauuVEk8
m2gi1GvcJXIxq2jM77w8nIILdjxoxB6ISQQYEQIACQUCSHjeBQIbDAAKCRCFUJmy
SciIWlHZAKCJyGKXrfd45XI9lP/Jz3GF5RmWrQCfWdHtDXkY3PWz1qFPj7EfXc2b
pog=
=zozD
-----END PGP PUBLIC KEY BLOCK-----
--- NEW FILE RPM-GPG-KEY-rpmfusion-free-fedora-11-primary ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.5 (GNU/Linux)
mQINBEnFEAYBEADsku+iiUQ3W0ALjsnq18GwtD6Kg/nKDuCI8LSPDaZVtL3oGF39
5p+o6ZAlREy8Zfj/YYcbKNj5nFUaFV1orGFvEsagSsEX0A8qAYzh8lDh5JUIUxPR
nTvELggT7mgL3SGMqP7T/Vvo26CixAIGkzFDwbrLal53abXCL6wjlIP1ese1+gSe
xUk0IFzY/U0/bb+31z5MClq6JzQ+K7oqxW6QkyO6LayeFGZZL61NIvMW+2edcfMu
5cpCSUQxs09aH+uQtaBqiwyObqT0DXcRQ/BwSjSxXUdr1Kp9VvwoipYPiV2plff+
vTHiCHHzoSZNKsE8I/BwJRI8Q8anK6zBZ8TjJG/mV1TsYeE3pBaEgXyobET2Mjcw
Rjhb910ihLpzuRAE16Ii4Bj22xrfpD0eQs0TpL+pXMGmf1YcKHbcaY5k1Q+jappd
NOhax326gFiniWbnlVz3/tIF8QfaUCYH2DmAyswiIXO/fytlNSwaHDY7OkqboL72
lC++EJ93Qd59w2opN+YPUNK9q3rn2bDj+3E2DZt9mI6bqlJSxgWV7MKumPmdegot
MuEH3NRZacbpMC4h1R3e9ZZ4CDskR+GqQsnOodyI33mhJcPhqTxpXyYoAitc9iaM
xmmnAi4IISTd4/2HXY0iNKmrVkaDG6tBwiRbOg9xHbbYKYjNHxA9ZA5thwARAQAB
tFNSUE0gRnVzaW9uIGZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgxMSkgPHJw
bWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCNgQTAQIAIAUC
ScUQBgIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEK0nCESPz/Tag9IP/0gI
LtShHh6bVhJMfFF86apZxjl7p6i+pY0ujO58OnfE4D6an9n2FCAMoJYY19QzerfZ
e8ofpSkKknES5TY/lZghvOvDTOUstzlpM6mYMpjtj33X/BGL+0lkc6vytPsHoO6S
lg+PaUJa2VPlR4QQsuRb+HcRJBCvjJXzRXXRFmklKb52uNZ2CcOXmtslTz6FYrRs
Q6TZmDz6qTQqTLCA8MciTlEos2vnrhh1GuJ1h3bqC5WmIWVLUbqct/LBzuSd+5V9
o1nnEkouLcBxZLCxf5k7HRSqLNslHmR5oYvwXT5XjC5CVZIHNA6xPQgScrn/e2nx
ZZ+WHeGvRn8tODLwHMVgynEbhL/bCBJ52Xrm7NoQ2OaZ/ULUOOASyRRnRRNVZsBr
Z1yqdCuGMAwgf+LgCftbirhRlcoi7iPUgIqzHkXdiZ+fdSVCbDub3U0HN3iXv5Qk
mfPv+kKZ5fOBgnSdID8sHez39qXcxzvYg8dvR7ahgmBCmHpa/+IWSDjXWlqcsYNe
sA6N/BWnwuwmUJlkYcr1atgd+XXLXHc5zepouBe9xGLKvme0B/3IxcR+Rgla5S9b
U9/blnH/G90NSS3vYymN/naasAEs2S6H0QdVv23w9Cabit8XDce4MeJ/GnckIL9l
RuwD9VHe8TVRZAtyKSc8447E5pbKdPPzF4VHCevl
=/iY7
-----END PGP PUBLIC KEY BLOCK-----
--- NEW FILE RPM-GPG-KEY-rpmfusion-free-fedora-12-primary ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.5 (GNU/Linux)
mQINBEoQCVkBEAC/C3Kbm1MJJ4A7e5T3HKFRFI0S5+jpKKtgohN9NzAJq2Q0/66M
CtQs2t0LBjVTiP3YMzvj33GFNuR/vYwLLYUSG/tJufEb4lNGaOopwgZziOyuqKOi
OeNmX8T2UwsU8IgkXcoYn/cgKk5I8B07n3F+Bunyl1GocGr8UXovH4sKRk3FdNi7
r+U6eIr9mMlOLVkvp/oF7rrheL3FJ86a/wkmouOjWVMHIiT2jLBaNs0vMN58o4qz
DUMTqWSHwSbXPGdrKHeHitvOQGeRc9AYopxPGhL1S/LolqZbK84tWdDvIPrQDYVk
35dKebrbQYuIcQEcU6nXr61U4UsgWi2366JmGbhYAkUNTm+B/maVbVvdAvkn86Lv
Ul5AlAVaMNjrPCh5um0nlz2vg2KwbRhLrwfIZYXvN8x+XLA8S+fgw61pkE63RvqE
oAB4zp8/1QAOsBwhYvDISPTlDsvR03C5JjNlMCVfoRXmwEeRoEzoKnhXhWNZGdAo
z1xR1gObkEX1i3/zk7OkJX4XJyvKsR3z4gZ+LTY+oE7ahSRBDNnsE0omcCuqV8XR
QjpZ1gUhSJImjfXI2GdDslJsSwAbIPq9uz10XMlIgu4nbbFif0PN8gwmYW7Tm6O6
iuZiU53S5QVGRVaQEbM93Nq+nMYZ3ZKYBaNGMSUrKWXtzyydU8fLte4qCQARAQAB
tFNSUE0gRnVzaW9uIGZyZWUgcmVwb3NpdG9yeSBmb3IgRmVkb3JhICgxMikgPHJw
bWZ1c2lvbi1idWlsZHN5c0BsaXN0cy5ycG1mdXNpb24ub3JnPokCNgQTAQIAIAUC
ShAJWQIbAwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJENVW/hMWyhpWQ5gP+wVo
jZ/srZtzjKwPu5xTzSfcFFvHWRW3mp6jogRC5qzw7ZcQ0v4FQCRvF4AZfDpjDr8B
f2PKreCELTzQ0P4ZQs1qdVsrEDJYuDh380lrmS9U0vgXw7JvBI/61NopoThQ5TKf
9ldCxEkQsPd4NFlR/6m6TxoO9POPH1kXHn10kkD0IrXMKDTg3OMrnf/FTvAhqjNB
j9HuQgnae3y//We+J7zi+xvLo24aig7VZ3CDvQ8lGchHFBkgxxNulb8xN3HzOWGj
KE+wwFDEiAL5D7mP7WG0baXsOhHfTuxXf1gvYfZ0U6nWSY5j0FH8MHt7mMK76qOc
MMBwqyVJuv2TZfaZMEuwwHMWcDw5kAMS2h1llcqrb8ANKG7vfhrcyuE7yHDnMhCf
ueszjwZoRGPJb6HUxgTnEWx7GcVqpOWhOVJoCyuglTfK1WUzYslLjqbOFcILhJKm
PRR1Matku0ab/Z1uuWmX0tLsS9H35UImFSbkB3RhQhFFNSj1U975j4chJLmQeWdW
Z5tMFB7/arD+jSVSzZITbzBLHHhSloILU7eL2X9HaY87kTSVTYMGMiRFTydwBLmE
0qY2W5m4xhF5RLoH9EtS82gu+5/AkSwgJfDR7G/3Zl250IbUakE+niovb8Cj1IFD
CZ4sRKbFMuJgbBG3IEq1gABoE1JNHcYZR3Q9tWMK
=+MTe
-----END PGP PUBLIC KEY BLOCK-----
Index: rpmfusion-free-rawhide.repo
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/F-10/rpmfusion-free-rawhide.repo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpmfusion-free-rawhide.repo 15 Nov 2008 10:33:04 -0000 1.4
+++ rpmfusion-free-rawhide.repo 17 May 2009 14:01:09 -0000 1.5
@@ -4,7 +4,7 @@
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-rawhi...
enabled=0
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch
[rpmfusion-free-rawhide-debuginfo]
name=RPM Fusion for Fedora Rawhide - Free - Debug
@@ -12,7 +12,7 @@
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-rawhi...
enabled=0
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch
[rpmfusion-free-rawhide-source]
name=RPM Fusion for Fedora Rawhide - Free - Source
@@ -20,5 +20,5 @@
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-rawhi...
enabled=0
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch
Index: rpmfusion-free-release.spec
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/F-10/rpmfusion-free-release.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rpmfusion-free-release.spec 15 Nov 2008 10:33:04 -0000 1.7
+++ rpmfusion-free-release.spec 17 May 2009 14:01:09 -0000 1.8
@@ -3,17 +3,19 @@
Name: rpmfusion-%{repo}-release
Version: 10
-Release: 1
+Release: 4
Summary: RPM Fusion (%{repo}) Repository Configuration
Group: System Environment/Base
License: BSD
URL: http://rpmfusion.org
-Source0: RPM-GPG-KEY-rpmfusion-%{repo}-fedora
Source1: rpmfusion-%{repo}.repo
Source2: rpmfusion-%{repo}-updates.repo
Source3: rpmfusion-%{repo}-updates-testing.repo
Source4: rpmfusion-%{repo}-rawhide.repo
+Source10: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-10-primary
+Source11: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-11-primary
+Source12: RPM-GPG-KEY-rpmfusion-%{repo}-fedora-12-primary
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -69,13 +71,33 @@
$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
# GPG Key
-%{__install} -Dp -m644 %{SOURCE0} \
+%{__install} -Dp -m644 %{SOURCE10} %{SOURCE11} %{SOURCE12} \
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg
+# compatibility symlink for easy transition to F11
+ln -s $(basename %{SOURCE10}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora
+
+# Links for the keys
+for i in i386 x86_64 ppc ppc64; do
+ ln -s $(basename %{SOURCE10}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-10-${i}
+ ln -s $(basename %{SOURCE11}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-11-${i}
+ ln -s $(basename %{SOURCE12}) $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-%{repo}-fedora-12-${i}
+done
+
+
# Yum .repo files
%{__install} -p -m644 %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} \
$RPM_BUILD_ROOT%{_sysconfdir}/yum.repos.d
+%post
+if grep 'mirrorlist=http://download1.rpmfusion.org/' %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}.repo &> /dev/null ; then
+ sed -i 's!mirrorlist=http://download1.rpmfusion.org/%{repo}/fedora/.mirrorlist-%{...!' %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}.repo
+fi
+if grep 'mirrorlist=http://download1.rpmfusion.org/' %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-updates.repo &> /dev/null ; then
+ sed -i 's!mirrorlist=http://download1.rpmfusion.org/%{repo}/fedora/.mirrorlist-%{...!' %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-updates.repo
+fi
+
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -85,6 +107,18 @@
%config(noreplace) %{_sysconfdir}/yum.repos.d/*
%changelog
+* Sun May 17 2009 Thorsten Leemhuis <fedora at leemhuis.info> - 10-4
+- add key for F12
+- some small adjustments to the spec
+- add post script that switch old config files from serverside mirrorlists to
+ mirrormanager
+
+* Sat May 16 2009 Till Maas <opensource(a)till.name> - 10-3
+- fix symlinks
+
+* Sat May 16 2009 Till Maas <opensource(a)till.name> - 10-2
+- allow easy transition to F11 with new gpg key and naming structure
+
* Sat Nov 15 2008 Thorsten Leemhuis <fedora at leemhuis.info> - 10-1
- build for F-10
Index: rpmfusion-free-updates-testing.repo
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/F-10/rpmfusion-free-updates-testing.repo,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rpmfusion-free-updates-testing.repo 3 Nov 2008 13:15:49 -0000 1.3
+++ rpmfusion-free-updates-testing.repo 17 May 2009 14:01:09 -0000 1.4
@@ -4,7 +4,7 @@
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updat...
enabled=0
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch
[rpmfusion-free-updates-testing-debuginfo]
name=RPM Fusion for Fedora $releasever - Free - Test Updates Debug
@@ -12,7 +12,7 @@
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updat...
enabled=0
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch
[rpmfusion-free-updates-testing-source]
name=RPM Fusion for Fedora $releasever - Free - Test Updates Source
@@ -20,5 +20,5 @@
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updat...
enabled=0
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch
Index: rpmfusion-free-updates.repo
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/F-10/rpmfusion-free-updates.repo,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpmfusion-free-updates.repo 15 Nov 2008 10:33:04 -0000 1.5
+++ rpmfusion-free-updates.repo 17 May 2009 14:01:09 -0000 1.6
@@ -4,7 +4,7 @@
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updat...
enabled=1
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch
[rpmfusion-free-updates-debuginfo]
name=RPM Fusion for Fedora $releasever - Free - Updates Debug
@@ -12,7 +12,7 @@
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updat...
enabled=0
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch
[rpmfusion-free-updates-source]
name=RPM Fusion for Fedora $releasever - Free - Updates Source
@@ -20,5 +20,5 @@
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updat...
enabled=0
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch
Index: rpmfusion-free.repo
===================================================================
RCS file: /cvs/free/rpms/rpmfusion-free-release/F-10/rpmfusion-free.repo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpmfusion-free.repo 15 Nov 2008 10:33:04 -0000 1.4
+++ rpmfusion-free.repo 17 May 2009 14:01:09 -0000 1.5
@@ -4,7 +4,7 @@
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-$rele...
enabled=1
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch
[rpmfusion-free-debuginfo]
name=RPM Fusion for Fedora $releasever - Free - Debug
@@ -12,7 +12,7 @@
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-debug...
enabled=0
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch
[rpmfusion-free-source]
name=RPM Fusion for Fedora $releasever - Free - Source
@@ -20,5 +20,5 @@
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-sourc...
enabled=0
gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever-$basearch
--- RPM-GPG-KEY-rpmfusion-free-fedora DELETED ---
15 years, 6 months
rpms/Cg/F-10 Cg.spec,1.2,1.3
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/Cg/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22142
Modified Files:
Cg.spec
Log Message:
Fix Clean
Index: Cg.spec
===================================================================
RCS file: /cvs/nonfree/rpms/Cg/F-10/Cg.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Cg.spec 12 May 2009 15:06:31 -0000 1.2
+++ Cg.spec 15 May 2009 17:18:04 -0000 1.3
@@ -16,7 +16,7 @@
Summary: NVIDIA Cg Toolkit
Name: Cg
Version: %{maj_version}.%{min_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://developer.nvidia.com/object/cg_toolkit.html
Group: Development/Languages
Source0: http://developer.download.nvidia.com/cg/Cg_%{maj_version}/Cg-%{maj_versio...
@@ -74,6 +74,11 @@
#Remove binary bundled tools
rm usr/bin/{cginfo,cgfxcat}
+#Clean exemples.
+for d in $(find usr/local/Cg/examples/OpenGL/{basic,advanced} -type d); do
+ pushd ${d} ; make clean ; popd
+done
+
%build
# Nothing to build
@@ -144,6 +149,9 @@
%changelog
+* Fri May 15 2009 kwizart < kwizart at gmail.com > - 2.2-2
+- Clean exemples.
+
* Wed Apr 22 2009 kwizart < kwizart at gmail.com > - 2.2-1
- Update to 2.2.0006 (April2009)
15 years, 6 months
rpms/Cg/devel Cg.spec,1.6,1.7
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/Cg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22036
Modified Files:
Cg.spec
Log Message:
Fix clean docs
Index: Cg.spec
===================================================================
RCS file: /cvs/nonfree/rpms/Cg/devel/Cg.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Cg.spec 12 May 2009 15:05:38 -0000 1.6
+++ Cg.spec 15 May 2009 17:17:37 -0000 1.7
@@ -16,7 +16,7 @@
Summary: NVIDIA Cg Toolkit
Name: Cg
Version: %{maj_version}.%{min_version}
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://developer.nvidia.com/object/cg_toolkit.html
Group: Development/Languages
Source0: http://developer.download.nvidia.com/cg/Cg_%{maj_version}/Cg-%{maj_versio...
@@ -74,6 +74,11 @@
#Remove binary bundled tools
rm usr/bin/{cginfo,cgfxcat}
+#Clean exemples.
+for d in $(find usr/local/Cg/examples/OpenGL/{basic,advanced} -type d); do
+ pushd ${d} ; make clean ; popd
+done
+
%build
# Nothing to build
@@ -144,6 +149,9 @@
%changelog
+* Fri May 15 2009 kwizart < kwizart at gmail.com > - 2.2-2
+- Clean exemples.
+
* Wed Apr 22 2009 kwizart < kwizart at gmail.com > - 2.2-1
- Update to 2.2.0006 (April2009)
15 years, 6 months
rpms/sdlmame/F-9 .cvsignore, 1.41, 1.42 sdlmame.spec, 1.48, 1.49 sources, 1.42, 1.43
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20413
Modified Files:
.cvsignore sdlmame.spec sources
Log Message:
* Thu May 14 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0132-0.2.0131u2
- Updated to 0.131u2
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-9/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore 8 May 2009 17:29:45 -0000 1.41
+++ .cvsignore 14 May 2009 21:02:18 -0000 1.42
@@ -1,2 +1,2 @@
ui.bdc
-sdlmame0131u1.zip
+sdlmame0131u2.zip
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-9/sdlmame.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- sdlmame.spec 8 May 2009 17:29:45 -0000 1.48
+++ sdlmame.spec 14 May 2009 21:02:18 -0000 1.49
@@ -1,4 +1,4 @@
-%define beta 0131u1
+%define beta 0131u2
%if "0%{?beta}" != "0"
%define _version %{?beta}
@@ -18,7 +18,7 @@
Name: sdlmame
Version: 0132
-Release: 0.1.%{?beta}%{?dist}
+Release: 0.2.%{?beta}%{?dist}
Summary: SDL Multiple Arcade Machine Emulator
Group: Applications/Emulators
@@ -213,6 +213,9 @@
%changelog
+* Thu May 14 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0132-0.2.0131u2
+- Updated to 0.131u2
+
* Thu May 07 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0132-0.1.0131u1
- Updated to 0.131u1
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-9/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources 8 May 2009 17:29:45 -0000 1.42
+++ sources 14 May 2009 21:02:18 -0000 1.43
@@ -1,2 +1,2 @@
b64914c2a5589f6d5b00361464152acd ui.bdc
-321f2dc74164e111d2c24ed949fbf5e1 sdlmame0131u1.zip
+aa318a0e6d953cb7e77c8d6cc5c6ddb6 sdlmame0131u2.zip
15 years, 6 months
rpms/sdlmame/F-10 .cvsignore, 1.41, 1.42 sdlmame.spec, 1.50, 1.51 sources, 1.42, 1.43
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/sdlmame/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20306
Modified Files:
.cvsignore sdlmame.spec sources
Log Message:
* Thu May 14 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0132-0.2.0131u2
- Updated to 0.131u2
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore 8 May 2009 17:29:31 -0000 1.41
+++ .cvsignore 14 May 2009 21:02:04 -0000 1.42
@@ -1,2 +1,2 @@
ui.bdc
-sdlmame0131u1.zip
+sdlmame0131u2.zip
Index: sdlmame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/sdlmame.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sdlmame.spec 8 May 2009 17:29:31 -0000 1.50
+++ sdlmame.spec 14 May 2009 21:02:04 -0000 1.51
@@ -1,4 +1,4 @@
-%define beta 0131u1
+%define beta 0131u2
%if "0%{?beta}" != "0"
%define _version %{?beta}
@@ -18,7 +18,7 @@
Name: sdlmame
Version: 0132
-Release: 0.1.%{?beta}%{?dist}
+Release: 0.2.%{?beta}%{?dist}
Summary: SDL Multiple Arcade Machine Emulator
Group: Applications/Emulators
@@ -213,6 +213,9 @@
%changelog
+* Thu May 14 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0132-0.2.0131u2
+- Updated to 0.131u2
+
* Thu May 07 2009 Julian Sikorski <belegdol[at]gmail[dot]com> - 0132-0.1.0131u1
- Updated to 0.131u1
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/sdlmame/F-10/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources 8 May 2009 17:29:31 -0000 1.42
+++ sources 14 May 2009 21:02:04 -0000 1.43
@@ -1,2 +1,2 @@
b64914c2a5589f6d5b00361464152acd ui.bdc
-321f2dc74164e111d2c24ed949fbf5e1 sdlmame0131u1.zip
+aa318a0e6d953cb7e77c8d6cc5c6ddb6 sdlmame0131u2.zip
15 years, 6 months
rpms/vagalume/F-10 vagalume-0.7.1-border_width.patch,1.1,1.2
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/vagalume/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17149/F-10
Modified Files:
vagalume-0.7.1-border_width.patch
Log Message:
Push corrected border_width patch to F-9 and F-10
vagalume-0.7.1-border_width.patch:
Index: vagalume-0.7.1-border_width.patch
===================================================================
RCS file: /cvs/free/rpms/vagalume/F-10/vagalume-0.7.1-border_width.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vagalume-0.7.1-border_width.patch 6 May 2009 00:08:03 -0000 1.1
+++ vagalume-0.7.1-border_width.patch 13 May 2009 17:07:35 -0000 1.2
@@ -1,6 +1,6 @@
---- trunk/src/vgl-main-window.c 2009/04/29 22:47:55 527
-+++ trunk/src/vgl-main-window.c 2009/05/01 12:44:11 528
-@@ -1036,12 +1036,13 @@
+--- vagalume-0.7.1.orig/src/vgl-main-window.c.border_width 2009-02-26 09:12:11.000000000 -0500
++++ vagalume-0.7.1.orig/src/vgl-main-window.c 2009-05-05 20:02:01.339619300 -0400
+@@ -1016,13 +1016,14 @@
priv->progressbar_text = g_string_sized_new(30);
g_string_assign(priv->progressbar_text, " ");
/* Window */
@@ -8,6 +8,7 @@
+#ifdef USE_HILDON_WINDOW
+ gtk_container_set_border_width(GTK_CONTAINER(win), 2);
+#else
+ win->type = GTK_WINDOW_TOPLEVEL;
gtk_window_set_default_size(win, 500, -1);
#endif
gtk_window_add_accel_group(win, accel);
15 years, 6 months
rpms/vagalume/F-9 vagalume-0.7.1-border_width.patch,1.1,1.2
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/vagalume/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv17149/F-9
Modified Files:
vagalume-0.7.1-border_width.patch
Log Message:
Push corrected border_width patch to F-9 and F-10
vagalume-0.7.1-border_width.patch:
Index: vagalume-0.7.1-border_width.patch
===================================================================
RCS file: /cvs/free/rpms/vagalume/F-9/vagalume-0.7.1-border_width.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- vagalume-0.7.1-border_width.patch 6 May 2009 00:08:03 -0000 1.1
+++ vagalume-0.7.1-border_width.patch 13 May 2009 17:07:35 -0000 1.2
@@ -1,6 +1,6 @@
---- trunk/src/vgl-main-window.c 2009/04/29 22:47:55 527
-+++ trunk/src/vgl-main-window.c 2009/05/01 12:44:11 528
-@@ -1036,12 +1036,13 @@
+--- vagalume-0.7.1.orig/src/vgl-main-window.c.border_width 2009-02-26 09:12:11.000000000 -0500
++++ vagalume-0.7.1.orig/src/vgl-main-window.c 2009-05-05 20:02:01.339619300 -0400
+@@ -1016,13 +1016,14 @@
priv->progressbar_text = g_string_sized_new(30);
g_string_assign(priv->progressbar_text, " ");
/* Window */
@@ -8,6 +8,7 @@
+#ifdef USE_HILDON_WINDOW
+ gtk_container_set_border_width(GTK_CONTAINER(win), 2);
+#else
+ win->type = GTK_WINDOW_TOPLEVEL;
gtk_window_set_default_size(win, 500, -1);
#endif
gtk_window_add_accel_group(win, accel);
15 years, 6 months
rpms/vagalume/F-9 vagalume-0.7.1-others.patch, NONE, 1.1 vagalume.spec, 1.5, 1.6
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/vagalume/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15554/F-9
Modified Files:
vagalume.spec
Added Files:
vagalume-0.7.1-others.patch
Log Message:
* Wed May 13 2009 Michel Salim <salimma(a)fedoraproject.org> - 0.7.1-3
- Enable playback of others' recommendations and tags (upstream bug #4072)
vagalume-0.7.1-others.patch:
--- NEW FILE vagalume-0.7.1-others.patch ---
--- vagalume-0.7.1.orig/src/vgl-main-window.c.others 2009-02-26 09:12:11.000000000 -0500
+++ vagalume-0.7.1.orig/src/vgl-main-window.c 2009-05-13 12:19:23.168774960 -0400
@@ -770,7 +770,7 @@
GtkWidget *play, *stop, *skip, *separ1, *separ2;
GtkWidget *stopafter, *love, *ban, *tag, *dorecomm, *addtopls, *dload;
GtkWidget *library, *neigh, *loved, *playlist, *recomm, *usertag;
- GtkWidget *library2, *neigh2, *loved2, *playlist2;
+ GtkWidget *library2, *neigh2, *loved2, *playlist2, *recomm2, *usertag2;
GtkWidget *managebmk, *bmkartist, *bmktrack;
GtkWidget *about;
#ifdef USE_HILDON_WINDOW
@@ -863,10 +863,14 @@
neigh2 = gtk_menu_item_new_with_label(_("Neighbours..."));
loved2 = gtk_menu_item_new_with_label(_("Loved tracks..."));
playlist2 = gtk_menu_item_new_with_label(_("Playlist..."));
+ recomm2 = gtk_menu_item_new_with_label(_("Recommendations..."));
+ usertag2 = gtk_menu_item_new_with_label(_("Music tagged..."));
gtk_menu_shell_append(othersub, library2);
gtk_menu_shell_append(othersub, neigh2);
gtk_menu_shell_append(othersub, loved2);
gtk_menu_shell_append(othersub, playlist2);
+ gtk_menu_shell_append(othersub, recomm2);
+ gtk_menu_shell_append(othersub, usertag2);
g_signal_connect(G_OBJECT(library2), "activate",
G_CALLBACK(others_radio_selected),
GINT_TO_POINTER(LASTFM_LIBRARY_RADIO));
@@ -879,6 +883,12 @@
g_signal_connect(G_OBJECT(playlist2), "activate",
G_CALLBACK(others_radio_selected),
GINT_TO_POINTER(LASTFM_USERPLAYLIST_RADIO));
+ g_signal_connect(G_OBJECT(recomm2), "activate",
+ G_CALLBACK(others_radio_selected),
+ GINT_TO_POINTER(LASTFM_RECOMMENDED_RADIO));
+ g_signal_connect(G_OBJECT(usertag2), "activate",
+ G_CALLBACK(others_radio_selected),
+ GINT_TO_POINTER(LASTFM_USERTAG_RADIO));
/* Actions */
actions = GTK_MENU_ITEM(gtk_menu_item_new_with_mnemonic(_("_Actions")));
--- vagalume-0.7.1.orig/src/controller.c.other 2009-02-26 09:07:31.000000000 -0500
+++ vagalume-0.7.1.orig/src/controller.c 2009-05-13 12:31:12.382534553 -0400
@@ -1448,13 +1448,34 @@
_("Play this user's radio"),
friends,
previous);
- if (user != NULL) {
+ if (user == NULL) return;
+
+ /* Store the new value for later use */
+ g_free(previous);
+ previous = user;
+
+ if (type == LASTFM_RECOMMENDED_RADIO) {
+ url = lastfm_recommended_radio_url(
+ user, 100);
+ } else if (type == LASTFM_USERTAG_RADIO) {
+ static char *previoustag = NULL;
+ char *tag;
+ tag = ui_input_dialog_with_list(
+ vgl_main_window_get_window(mainwin, TRUE),
+ _("Enter tag"), _("Enter one of your tags"),
+ usertags, previoustag);
+ if (tag != NULL) {
+ url = lastfm_usertag_radio_url(user, tag);
+ /* Store the new value for later use */
+ g_free(previoustag);
+ previoustag = tag;
+ }
+ } else {
url = lastfm_radio_url(type, user);
+ }
+ if (url != NULL) {
controller_play_radio_by_url(url);
g_free(url);
- /* Store the new value for later use */
- g_free(previous);
- previous = user;
}
}
Index: vagalume.spec
===================================================================
RCS file: /cvs/free/rpms/vagalume/F-9/vagalume.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vagalume.spec 6 May 2009 00:08:03 -0000 1.5
+++ vagalume.spec 13 May 2009 16:46:58 -0000 1.6
@@ -1,13 +1,15 @@
Name: vagalume
Version: 0.7.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Last.fm client for GNOME and Maemo
Group: Applications/Multimedia
License: GPLv3
URL: http://vagalume.igalia.com/
Source0: http://vagalume.igalia.com/files/source/vagalume_%{version}.orig.tar.gz
+# remove patch0 when 0.7.2 is released
Patch0: %{name}-0.7.1-border_width.patch
+Patch1: %{name}-0.7.1-others.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gstreamer-devel gtk2-devel libxml2-devel
@@ -47,6 +49,7 @@
%prep
%setup -q -n %{name}-%{version}.orig
%patch0 -p1 -b .border_width
+%patch1 -p1 -b .others
%build
@@ -93,6 +96,9 @@
%changelog
+* Wed May 13 2009 Michel Salim <salimma(a)fedoraproject.org> - 0.7.1-3
+- Enable playback of others' recommendations and tags (upstream bug #4072)
+
* Tue May 5 2009 Michel Salim <salimma(a)fedoraproject.org> - 0.7.1-2
- Fix border width (upstream bug #4041)
15 years, 6 months
rpms/vagalume/F-10 vagalume-0.7.1-others.patch, NONE, 1.1 vagalume.spec, 1.5, 1.6
by Michel Alexandre Salim
Author: salimma
Update of /cvs/free/rpms/vagalume/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15554/F-10
Modified Files:
vagalume.spec
Added Files:
vagalume-0.7.1-others.patch
Log Message:
* Wed May 13 2009 Michel Salim <salimma(a)fedoraproject.org> - 0.7.1-3
- Enable playback of others' recommendations and tags (upstream bug #4072)
vagalume-0.7.1-others.patch:
--- NEW FILE vagalume-0.7.1-others.patch ---
--- vagalume-0.7.1.orig/src/vgl-main-window.c.others 2009-02-26 09:12:11.000000000 -0500
+++ vagalume-0.7.1.orig/src/vgl-main-window.c 2009-05-13 12:19:23.168774960 -0400
@@ -770,7 +770,7 @@
GtkWidget *play, *stop, *skip, *separ1, *separ2;
GtkWidget *stopafter, *love, *ban, *tag, *dorecomm, *addtopls, *dload;
GtkWidget *library, *neigh, *loved, *playlist, *recomm, *usertag;
- GtkWidget *library2, *neigh2, *loved2, *playlist2;
+ GtkWidget *library2, *neigh2, *loved2, *playlist2, *recomm2, *usertag2;
GtkWidget *managebmk, *bmkartist, *bmktrack;
GtkWidget *about;
#ifdef USE_HILDON_WINDOW
@@ -863,10 +863,14 @@
neigh2 = gtk_menu_item_new_with_label(_("Neighbours..."));
loved2 = gtk_menu_item_new_with_label(_("Loved tracks..."));
playlist2 = gtk_menu_item_new_with_label(_("Playlist..."));
+ recomm2 = gtk_menu_item_new_with_label(_("Recommendations..."));
+ usertag2 = gtk_menu_item_new_with_label(_("Music tagged..."));
gtk_menu_shell_append(othersub, library2);
gtk_menu_shell_append(othersub, neigh2);
gtk_menu_shell_append(othersub, loved2);
gtk_menu_shell_append(othersub, playlist2);
+ gtk_menu_shell_append(othersub, recomm2);
+ gtk_menu_shell_append(othersub, usertag2);
g_signal_connect(G_OBJECT(library2), "activate",
G_CALLBACK(others_radio_selected),
GINT_TO_POINTER(LASTFM_LIBRARY_RADIO));
@@ -879,6 +883,12 @@
g_signal_connect(G_OBJECT(playlist2), "activate",
G_CALLBACK(others_radio_selected),
GINT_TO_POINTER(LASTFM_USERPLAYLIST_RADIO));
+ g_signal_connect(G_OBJECT(recomm2), "activate",
+ G_CALLBACK(others_radio_selected),
+ GINT_TO_POINTER(LASTFM_RECOMMENDED_RADIO));
+ g_signal_connect(G_OBJECT(usertag2), "activate",
+ G_CALLBACK(others_radio_selected),
+ GINT_TO_POINTER(LASTFM_USERTAG_RADIO));
/* Actions */
actions = GTK_MENU_ITEM(gtk_menu_item_new_with_mnemonic(_("_Actions")));
--- vagalume-0.7.1.orig/src/controller.c.other 2009-02-26 09:07:31.000000000 -0500
+++ vagalume-0.7.1.orig/src/controller.c 2009-05-13 12:31:12.382534553 -0400
@@ -1448,13 +1448,34 @@
_("Play this user's radio"),
friends,
previous);
- if (user != NULL) {
+ if (user == NULL) return;
+
+ /* Store the new value for later use */
+ g_free(previous);
+ previous = user;
+
+ if (type == LASTFM_RECOMMENDED_RADIO) {
+ url = lastfm_recommended_radio_url(
+ user, 100);
+ } else if (type == LASTFM_USERTAG_RADIO) {
+ static char *previoustag = NULL;
+ char *tag;
+ tag = ui_input_dialog_with_list(
+ vgl_main_window_get_window(mainwin, TRUE),
+ _("Enter tag"), _("Enter one of your tags"),
+ usertags, previoustag);
+ if (tag != NULL) {
+ url = lastfm_usertag_radio_url(user, tag);
+ /* Store the new value for later use */
+ g_free(previoustag);
+ previoustag = tag;
+ }
+ } else {
url = lastfm_radio_url(type, user);
+ }
+ if (url != NULL) {
controller_play_radio_by_url(url);
g_free(url);
- /* Store the new value for later use */
- g_free(previous);
- previous = user;
}
}
Index: vagalume.spec
===================================================================
RCS file: /cvs/free/rpms/vagalume/F-10/vagalume.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- vagalume.spec 6 May 2009 00:08:03 -0000 1.5
+++ vagalume.spec 13 May 2009 16:46:57 -0000 1.6
@@ -1,13 +1,15 @@
Name: vagalume
Version: 0.7.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Last.fm client for GNOME and Maemo
Group: Applications/Multimedia
License: GPLv3
URL: http://vagalume.igalia.com/
Source0: http://vagalume.igalia.com/files/source/vagalume_%{version}.orig.tar.gz
+# remove patch0 when 0.7.2 is released
Patch0: %{name}-0.7.1-border_width.patch
+Patch1: %{name}-0.7.1-others.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gstreamer-devel gtk2-devel libxml2-devel
@@ -47,6 +49,7 @@
%prep
%setup -q -n %{name}-%{version}.orig
%patch0 -p1 -b .border_width
+%patch1 -p1 -b .others
%build
@@ -93,6 +96,9 @@
%changelog
+* Wed May 13 2009 Michel Salim <salimma(a)fedoraproject.org> - 0.7.1-3
+- Enable playback of others' recommendations and tags (upstream bug #4072)
+
* Tue May 5 2009 Michel Salim <salimma(a)fedoraproject.org> - 0.7.1-2
- Fix border width (upstream bug #4041)
15 years, 6 months