[caja-dropbox] fix build
by Wolfgang Ulbrich
commit aba223462fd3851fd21301f217af0da57e6cf3fa
Author: raveit65 <mate(a)raveit.de>
Date: Sun Apr 7 21:18:21 2019 +0200
fix build
caja-dropbox.spec | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/caja-dropbox.spec b/caja-dropbox.spec
index 3a320c9..1cd11e4 100644
--- a/caja-dropbox.spec
+++ b/caja-dropbox.spec
@@ -46,11 +46,9 @@ find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f
rm -rf %{buildroot}%{_bindir}
rm -rf %{buildroot}%{_datadir}/caja-dropbox/*
-rm -rf %{buildroot}%{_icondir}/*
-rm -rf %{buildroot}%{_mandir}/man1/caja-dropbox.1.*
-rm -rf %{buildroot}%{_datadir}/applications/caja-dropbox.desktop
-
-%ldconfig_scriptlets
+rm -rf %{buildroot}%{_datadir}/icons/hicolor/*/apps/*
+rm -rf %{buildroot}%{_datadir}/man/man1/*
+rm -rf %{buildroot}%{_datadir}/applications/*
%files
5 years
[caja-dropbox/f30] remove packages from icondir
by Wolfgang Ulbrich
commit 713ccbcb018d5b77c0b3ca6221d626fb2d71ec84
Author: raveit65 <mate(a)raveit.de>
Date: Sun Apr 7 20:13:01 2019 +0200
remove packages from icondir
caja-dropbox.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/caja-dropbox.spec b/caja-dropbox.spec
index 28268ee..afd7e49 100644
--- a/caja-dropbox.spec
+++ b/caja-dropbox.spec
@@ -49,7 +49,7 @@ find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f
rm -rf %{buildroot}%{_bindir}
rm -rf %{buildroot}%{_datadir}/caja-dropbox/*
-rm -rf %{buildroot}%{_icondir}
+rm -rf %{buildroot}%{_icondir}/*
rm -rf %{buildroot}%{_mandir}/man1/caja-dropbox.1.*
rm -rf %{buildroot}%{_datadir}/applications/caja-dropbox.desktop
5 years
[caja-dropbox] remove packages from icondir
by Wolfgang Ulbrich
commit 1c5d758aa23a5992f0a95e8b0ec5e9703d121f3e
Author: raveit65 <mate(a)raveit.de>
Date: Sun Apr 7 20:13:01 2019 +0200
remove packages from icondir
caja-dropbox.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/caja-dropbox.spec b/caja-dropbox.spec
index cc321fe..3a320c9 100644
--- a/caja-dropbox.spec
+++ b/caja-dropbox.spec
@@ -46,7 +46,7 @@ find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f
rm -rf %{buildroot}%{_bindir}
rm -rf %{buildroot}%{_datadir}/caja-dropbox/*
-rm -rf %{buildroot}%{_icondir}
+rm -rf %{buildroot}%{_icondir}/*
rm -rf %{buildroot}%{_mandir}/man1/caja-dropbox.1.*
rm -rf %{buildroot}%{_datadir}/applications/caja-dropbox.desktop
5 years
[caja-dropbox/f30: 2/2] exclude ppc64le arch for f30
by Wolfgang Ulbrich
commit fd3ccef554e36f504f086f7525509c2cbae28054
Author: raveit65 <mate(a)raveit.de>
Date: Sun Apr 7 20:01:32 2019 +0200
exclude ppc64le arch for f30
caja-dropbox.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/caja-dropbox.spec b/caja-dropbox.spec
index cc321fe..28268ee 100644
--- a/caja-dropbox.spec
+++ b/caja-dropbox.spec
@@ -15,6 +15,9 @@ Patch1: caja-dropbox_0001-show-full-path-of-caja-extension-dir.patch
# https://github.com/mate-desktop/caja-dropbox/commit/5fdcb17
Patch2: caja-dropbox_0002-Use-CAJA_EXTENSION_DIR_SYS-to-save-and-show-system-c.patch
+# link to fedora repos seems to be wrong for f30
+ExcludeArch: ppc64le
+
BuildRequires: gcc
BuildRequires: caja-devel
BuildRequires: mate-common
5 years
[caja-dropbox] update patches
by Wolfgang Ulbrich
commit cecb83391c95d8446017725fe13f62bd6f8c7525
Author: raveit65 <mate(a)raveit.de>
Date: Sun Apr 7 19:59:11 2019 +0200
update patches
...disable-creation-of-dropbox-script-binary.patch | 22 -----------
...0001-show-full-path-of-caja-extension-dir.patch | 29 ++++++++++++++
...TENSION_DIR_SYS-to-save-and-show-system-c.patch | 44 ++++++++++++++++++++++
caja-dropbox_fix-pygtk-in-configure.patch | 18 ---------
use_python2.patch | 38 -------------------
5 files changed, 73 insertions(+), 78 deletions(-)
---
diff --git a/caja-dropbox_0001-show-full-path-of-caja-extension-dir.patch b/caja-dropbox_0001-show-full-path-of-caja-extension-dir.patch
new file mode 100644
index 0000000..b11ae3b
--- /dev/null
+++ b/caja-dropbox_0001-show-full-path-of-caja-extension-dir.patch
@@ -0,0 +1,29 @@
+From 3b7c67c9cc68317a7066ab33165d93ffdeb8e8d1 Mon Sep 17 00:00:00 2001
+From: Wu Xiaotian <yetist(a)gmail.com>
+Date: Tue, 19 Feb 2019 17:04:25 +0800
+Subject: [PATCH 1/2] show full path of caja-extension-dir
+
+---
+ configure.ac | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index bf52831..5f061f7 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -91,7 +91,11 @@ if test -z "$CAJA_EXTENSION_DIR"; then
+ custom_caja_extension_dir=false
+ fi
+
+-AC_MSG_RESULT([${CAJA_EXTENSION_DIR}])
++if test x$custom_caja_extension_dir = xtrue; then
++ AC_MSG_RESULT([${CAJA_EXTENSION_DIR}])
++else
++ AC_MSG_RESULT([${libdir}/${CAJA_EXTENSION_DIR}])
++fi
+ AM_CONDITIONAL([CUSTOM_CAJA_EXTENSION_DIR], [test x$custom_caja_extension_dir = xtrue])
+ AC_SUBST(CAJA_EXTENSION_DIR)
+
+--
+2.21.0
+
diff --git a/caja-dropbox_0002-Use-CAJA_EXTENSION_DIR_SYS-to-save-and-show-system-c.patch b/caja-dropbox_0002-Use-CAJA_EXTENSION_DIR_SYS-to-save-and-show-system-c.patch
new file mode 100644
index 0000000..1f1108a
--- /dev/null
+++ b/caja-dropbox_0002-Use-CAJA_EXTENSION_DIR_SYS-to-save-and-show-system-c.patch
@@ -0,0 +1,44 @@
+From a12424a913d137f377f9d5401999bdd6c7fbd8e1 Mon Sep 17 00:00:00 2001
+From: Wu Xiaotian <yetist(a)gmail.com>
+Date: Thu, 28 Feb 2019 10:46:53 +0800
+Subject: [PATCH 2/2] Use CAJA_EXTENSION_DIR_SYS to save and show system caja
+ extension dir
+
+Here just show message, so a new variable used to save and show.
+Remove fallback caja_extension_dir set, pkg check libcaja-extension
+before, so this is not needed.
+---
+ configure.ac | 10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5f061f7..7b63336 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -81,20 +81,16 @@ if test -n "$with_caja_extension_dir"; then
+ CAJA_EXTENSION_DIR=$with_caja_extension_dir
+ custom_caja_extension_dir=true
+ else
+- CAJA_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libcaja-extension`
+- CAJA_EXTENSION_DIR=${CAJA_EXTENSION_DIR#`$PKG_CONFIG --variable=libdir libcaja-extension`}
++ CAJA_EXTENSION_DIR_SYS=`$PKG_CONFIG --variable=extensiondir libcaja-extension`
++ CAJA_EXTENSION_DIR=${CAJA_EXTENSION_DIR_SYS#`$PKG_CONFIG --variable=libdir libcaja-extension`}
+ CAJA_EXTENSION_DIR=${CAJA_EXTENSION_DIR#/}
+ custom_caja_extension_dir=false
+ fi
+-if test -z "$CAJA_EXTENSION_DIR"; then
+- CAJA_EXTENSION_DIR='caja/extensions-2.0'
+- custom_caja_extension_dir=false
+-fi
+
+ if test x$custom_caja_extension_dir = xtrue; then
+ AC_MSG_RESULT([${CAJA_EXTENSION_DIR}])
+ else
+- AC_MSG_RESULT([${libdir}/${CAJA_EXTENSION_DIR}])
++ AC_MSG_RESULT([${CAJA_EXTENSION_DIR_SYS}])
+ fi
+ AM_CONDITIONAL([CUSTOM_CAJA_EXTENSION_DIR], [test x$custom_caja_extension_dir = xtrue])
+ AC_SUBST(CAJA_EXTENSION_DIR)
+--
+2.21.0
+
5 years
[nemo-dropbox/f30] build for all archs, except ppc64le for f30
by Wolfgang Ulbrich
commit 38a337ad1bd0f4a97bf1fabf3a30123d1b8ba268
Author: raveit65 <mate(a)raveit.de>
Date: Sun Apr 7 19:54:22 2019 +0200
build for all archs, except ppc64le for f30
nemo-dropbox.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/nemo-dropbox.spec b/nemo-dropbox.spec
index 8fcee52..dffbae4 100644
--- a/nemo-dropbox.spec
+++ b/nemo-dropbox.spec
@@ -7,6 +7,9 @@ URL: https://github.com/linuxmint/nemo-extensions
Source0: %url/archive/%{version}.tar.gz#/nemo-extensions-%{version}.tar.gz
Patch0: use_python2.patch
+# links to fedora repos seems to be wrong for f30
+ExcludeArch: ppc64le
+
BuildRequires: nemo-devel
BuildRequires: python2-docutils
BuildRequires: automake
@@ -52,7 +55,7 @@ rm -rf %{buildroot}%{_datadir}
%changelog
* Sun Apr 07 2019 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 4.0.0-3
-- build for all archs
+- build for all archs, except ppc64le for f30
* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 4.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years
[nautilus-dropbox/f30] build for all archs, except ppc64le for f30
by Wolfgang Ulbrich
commit e4b60c394c3b8b83f0bda1ed95f3608fe4d8439d
Author: raveit65 <mate(a)raveit.de>
Date: Sun Apr 7 19:50:33 2019 +0200
build for all archs, except ppc64le for f30
nautilus-dropbox.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/nautilus-dropbox.spec b/nautilus-dropbox.spec
index a74ab87..23b5776 100644
--- a/nautilus-dropbox.spec
+++ b/nautilus-dropbox.spec
@@ -7,6 +7,9 @@ License: GPLv3+
URL: https://www.dropbox.com
Source: https://linux.dropbox.com/packages/%{name}-%{version}.tar.bz2
+# links to fedora repos seems to be wrong for f30
+ExcludeArch: ppc64le
+
# add 10 second delay to autostart to ensure it loads on session startup
Patch0: add_startup_delay.patch
Patch1: python3-docutils_fix.patch
@@ -66,7 +69,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/dropbox.desktop
%changelog
* Sun Apr 07 2019 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1:2019.01.31-3
-- build for all archs
+- build for all archs, except ppc64le for f30
* Tue Mar 05 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 1:2019.01.31-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
5 years
[wl-kmod/el6] (27 commits) ...Rework SPEC file in order to build for RHEL 6.x and 7.x Rebuilt for akmods-ostree-post scriptlet
by Nicolas Viéville
Summary of changes:
3f4b4e0... Fixup don't use lookaside cache for this file (*)
c0f022c... Add patch to replace IEEE80211_BAND_x macros with NL80211_B (*)
9da558c... Re-add sources (rfpkg new-sources ...) (*)
7aab64d... Fix 4.7 kernel patch (*)
69c510c... Add patch for kernel >= 4.8 - add cfg80211_scan_info struct (*)
6ecf276... Add patch to fix kernel warnings - thanks to Adrien Bustany (*)
573adaf... - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass (*)
55ac30b... Add patch for kernel >= 4.11 - remove last_rx reference in (*)
fda5796... Merge branch 'master' of ssh://pkgs.rpmfusion.org/nonfree/w (*)
43b389a... Add patch for kernel >= 4.11 - remove last_rx reference in (*)
4cc9d1f... Fix build Release tag (*)
cbba1b2... Fix build Release tag (*)
16da630... Add akmod-wl AkmodsBuildRequires and fix package BuildRequi (*)
37c0144... Add akmod-wl AkmodsBuildRequires and fix package BuildRequi (*)
a702359... Merge branch 'f26' in order to be in sync with master again (*)
b7c66d6... Add patch for kernel >= 4.12 - add cfg80211_roam_info struc (*)
3cf1535... Rework patch for kernel >= 4.12 - thanks to Tim Thomas (*)
23c78fc... - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass (*)
c1d4c41... Add patch for kernel >= 4.14 from Olaf Hering - thanks to T (*)
022d878... Add patch for kernel >= 4.15 - fix timer issue - rfbz#4798 (*)
c4ae3c9... - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass (*)
ef3d6e6... Add patch for GCC >= 8 - fix strncpy truncation compiler wa (*)
15be156... - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass (*)
8de95a7... - Rebuilt for Fedora 29 Mass Rebuild binutils issue (*)
a221a2c... Don't increment position if not needed after kernel_read fu (*)
7b623bd... - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass (*)
6cbc8c5... Rework SPEC file in order to build for RHEL 6.x and 7.x Reb (*)
(*) This commit already existed in another branch; no separate mail sent
5 years