[rpmfusion-free-release/f25] Switch to branched layout
by nchauvet
commit 0e2e234f43d747cbda26cdaa9a5d1d7f94ccf98c
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Aug 10 20:38:10 2016 +0200
Switch to branched layout
rpmfusion-free-updates-testing.repo | 2 +-
rpmfusion-free.repo | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/rpmfusion-free-updates-testing.repo b/rpmfusion-free-updates-testing.repo
index 16eb0de..42078e9 100644
--- a/rpmfusion-free-updates-testing.repo
+++ b/rpmfusion-free-updates-testing.repo
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora $releasever - Free - Test Updates
#baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/$basearch/
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-updat...
-enabled=0
+enabled=1
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
diff --git a/rpmfusion-free.repo b/rpmfusion-free.repo
index 475d59d..e4c082c 100644
--- a/rpmfusion-free.repo
+++ b/rpmfusion-free.repo
@@ -2,8 +2,8 @@
name=RPM Fusion for Fedora $releasever - Free
#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
mirrorlist=http://mirrors.rpmfusion.org/mirrorlist?repo=free-fedora-$rele...
-enabled=0
-metadata_expire=7d
+enabled=1
+#metadata_expire=7d
gpgcheck=1
gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-rpmfusion-free-fedora-$releasever
8 years, 3 months
[caja-dropbox/f25] (2 commits) ...fix typo
by Wolfgang Ulbrich
Summary of changes:
84e4532... update to 1.15.0 release (*)
927ed7c... fix typo (*)
(*) This commit already existed in another branch; no separate mail sent
8 years, 3 months
[caja-dropbox] fix typo
by Wolfgang Ulbrich
commit 927ed7c38cd7189b8387339e0e133650afc89216
Author: raveit65 <chat-to-me(a)raveit.de>
Date: Thu Aug 11 14:12:40 2016 +0200
fix typo
caja-dropbox.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/caja-dropbox.spec b/caja-dropbox.spec
index d08c3f2..7ee19c1 100644
--- a/caja-dropbox.spec
+++ b/caja-dropbox.spec
@@ -57,7 +57,7 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}
%changelog
-* Thu Aug 11 2015 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.15.0-1
+* Thu Aug 11 2016 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.15.0-1
- update to 1.15.0 release
* Sun Jun 19 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.14.0-1
8 years, 3 months
[caja-dropbox] update to 1.15.0 release
by Wolfgang Ulbrich
commit 84e45326907ece272953a77d1235c6ab7bd443ec
Author: raveit65 <chat-to-me(a)raveit.de>
Date: Thu Aug 11 14:11:26 2016 +0200
update to 1.15.0 release
.gitignore | 1 +
caja-dropbox.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5d3b2d6..2cca52b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
caja-dropbox-1.10.0.tar.xz
+/caja-dropbox-1.15.0.tar.xz
diff --git a/caja-dropbox.spec b/caja-dropbox.spec
index cf1968e..d08c3f2 100644
--- a/caja-dropbox.spec
+++ b/caja-dropbox.spec
@@ -1,9 +1,9 @@
# This is needed, because src-url contains branched part of versioning-scheme.
-%global branch 1.14
+%global branch 1.15
Summary: Dropbox extension for caja
Name: caja-dropbox
-Version: 1.14.0
+Version: 1.15.0
Release: 1%{?dist}
License: GPLv2+
Group: User Interface/Desktops
@@ -57,6 +57,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}
%changelog
+* Thu Aug 11 2015 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.15.0-1
+- update to 1.15.0 release
+
* Sun Jun 19 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 1.14.0-1
- update to 1.14.0 release
diff --git a/sources b/sources
index 5788055..cacdf4b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e7164bceb94943460397b20c669f0de8 caja-dropbox-1.14.0.tar.xz
+78fbb88fc5b9467996ff98be1c7b13e1 caja-dropbox-1.15.0.tar.xz
8 years, 3 months
[lives] Update appdata file
by Antonio
commit 3e8fb7c6d92e5ff6403b255627fcc8cd0e819b3a
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Aug 11 11:59:41 2016 +0200
Update appdata file
LiVES.appdata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/LiVES.appdata.xml b/LiVES.appdata.xml
index ed9a5cb..d3d305a 100644
--- a/LiVES.appdata.xml
+++ b/LiVES.appdata.xml
@@ -4,7 +4,7 @@
<metadata_license>CC0-1.0</metadata_license>
<summary>Video editor and VJ tool</summary>
<name>LiVES</name>
- <project_license>GPL-3.0+ and LGPL-3.0+</project_license>
+ <project_license>GPL-3.0 and LGPL-3.0</project_license>
<categories>
<category>Multimedia</category>
</categories>
8 years, 3 months
[lives] Update appdata file
by Antonio
commit 39e5ff01b9159210a1e5cd33df00c4799e6aa565
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Thu Aug 11 11:48:38 2016 +0200
Update appdata file
LiVES.appdata.xml | 12 +++++++-----
lives.spec | 5 ++++-
2 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/LiVES.appdata.xml b/LiVES.appdata.xml
index 532f04e..ed9a5cb 100644
--- a/LiVES.appdata.xml
+++ b/LiVES.appdata.xml
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Richard Hughes <richard(a)hughsie.com> -->
<component type="desktop">
<id type="desktop">LiVES.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
@@ -7,7 +6,7 @@
<name>LiVES</name>
<project_license>GPL-3.0+ and LGPL-3.0+</project_license>
<categories>
- <category>Multimedia</category>
+ <category>Multimedia</category>
</categories>
<description>
<p>
@@ -35,11 +34,14 @@
<url type="homepage">http://lives-video.com/</url>
<screenshots>
<screenshot type="default">
- <image>http://lives-video.com/images/livescess.png</image>
+ <image>http://lives-video.com/images/livescess.png</image>
</screenshot>
<screenshot>
- <image>http://lives-video.com/images/livesmtss.png</image>
+ <image>http://lives-video.com/images/livesmtss.png</image>
</screenshot>
</screenshots>
- <updatecontact>sagitter_at_fedoraproject.org</updatecontact>
+ <update_contact>sagitter_at_fedoraproject.org</update_contact>
+ <developer_name>Gabriel "Salsaman" Finch</developer_name>
+ <url type="bugtracker">https://sourceforge.net/p/lives/bugs/</url>
+ <url type="donation">http://lives-video.com/index.php?do=donate</url>
</component>
diff --git a/lives.spec b/lives.spec
index 1e9ba17..9f73ab0 100644
--- a/lives.spec
+++ b/lives.spec
@@ -1,6 +1,6 @@
Name: lives
Version: 2.6.4
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Video editor and VJ tool
License: GPLv3+ and LGPLv3+
URL: http://lives-video.com
@@ -165,6 +165,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/*.appdata.
%{_datadir}/appdata/LiVES.appdata.xml
%changelog
+* Thu Aug 11 2016 Antonio Trande <sagitterATfedoraproject.org> - 2.6.4-3
+- Update appdata file
+
* Mon Aug 08 2016 Antonio Trande <sagitterATfedoraproject.org> - 2.6.4-2
- Drop old patch
8 years, 3 months
[xorg-x11-drv-nvidia/f24: 2/2] Merge branch 'master' into f24
by Leigh Scott
commit 3d9468d52fc1c2857f3d786b982c4a34368b86e6
Merge: 0855d1e 1b6e42a
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Aug 10 19:24:38 2016 +0100
Merge branch 'master' into f24
xorg-x11-drv-nvidia.spec | 4 ++++
1 file changed, 4 insertions(+)
---
8 years, 3 months
