rpms/staging-kmod-addons/F-20 staging-kmod-addons.spec,1.14,1.15
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod-addons/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv21174
Modified Files:
staging-kmod-addons.spec
Log Message:
add BR /usr/include/libudev.h
Index: staging-kmod-addons.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-20/staging-kmod-addons.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- staging-kmod-addons.spec 13 Jul 2014 13:54:45 -0000 1.14
+++ staging-kmod-addons.spec 13 Jul 2014 14:02:10 -0000 1.15
@@ -24,6 +24,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: glib2-devel libtool pkgconfig
BuildRequires: libsysfs-devel
+BuildRequires: %{_includedir}/libudev.h
%if 0%{?fedora} >= 20
BuildRequires: %{_prefix}/lib/rpm/macros.d/macros.systemd
%else
@@ -148,6 +149,7 @@
- Update to 3.15.4
- drop ECHI and R8187SE (left)
- adjust downloadscript for file movements
+- add BR /usr/include/libudev.h
* Wed Apr 30 2014 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.14.2-1
- Update to 3.14.2
9 years, 9 months
rpms/staging-kmod-addons/F-20 create-linux-staging-tarball.sh, 1.5, 1.6 sources, 1.11, 1.12 staging-kmod-addons.spec, 1.13, 1.14
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod-addons/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20852
Modified Files:
create-linux-staging-tarball.sh sources
staging-kmod-addons.spec
Log Message:
* Sun Jul 13 2014 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.15.4-1
- Update to 3.15.4
- drop ECHI and R8187SE (left)
- adjust downloadscript for file movements
Index: create-linux-staging-tarball.sh
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-20/create-linux-staging-tarball.sh,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- create-linux-staging-tarball.sh 15 Feb 2014 12:32:17 -0000 1.5
+++ create-linux-staging-tarball.sh 13 Jul 2014 13:54:45 -0000 1.6
@@ -15,11 +15,11 @@
echo downloading
wget --quiet http://www.kernel.org/pub/linux/kernel/v3.0/linux-${1}.tar.xz
echo extracing
-tar -xJf linux-${1}.tar.xz linux-${1}/COPYING linux-${1}/drivers/staging/ linux-${1}/drivers/video/sis/
+tar -xJf linux-${1}.tar.xz linux-${1}/COPYING linux-${1}/drivers/staging/ linux-${1}/drivers/video/fbdev/sis/
echo creating archive
mv linux-${1} linux-staging-${1}
# drivers/video/sis/vgatypes.h needed for FB_XGI
-tar -cJf ${targetdir}/linux-staging-${1}.tar.xz linux-staging-${1}/COPYING linux-staging-${1}/drivers/staging/ linux-staging-${1}/drivers/video/sis/
+tar -cJf ${targetdir}/linux-staging-${1}.tar.xz linux-staging-${1}/COPYING linux-staging-${1}/drivers/staging/ linux-staging-${1}/drivers/video/fbdev/sis/
rm -rf linux-${1}.tar.xz linux-staging-${1}/
popd > /dev/null
rmdir ${tmpdir}
Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-20/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 30 Apr 2014 11:34:54 -0000 1.11
+++ sources 13 Jul 2014 13:54:45 -0000 1.12
@@ -1 +1 @@
-c8c1e4c64c1e5fbe482e3c2e956d43a8 linux-staging-3.14.2.tar.xz
+998298567f41b99c223016dda0940855 linux-staging-3.15.4.tar.xz
Index: staging-kmod-addons.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod-addons/F-20/staging-kmod-addons.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- staging-kmod-addons.spec 30 Apr 2014 11:34:54 -0000 1.13
+++ staging-kmod-addons.spec 13 Jul 2014 13:54:45 -0000 1.14
@@ -1,12 +1,12 @@
# drivers that we ship; to be synced with staging-kmod.spec
-%global stgdrvs BCM_WIMAX DGRP ECHO FB_XGI FT1000 IDE_PHISON LINE6_USB LTE_GDM724X NET_VENDOR_SILICOM PRISM2_USB R8187SE R8188EU RTL8192U RTS5139 SOLO6X10 SPEAKUP TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 TRANZPORT USB_ENESTORAGE USB_SERIAL_QUATECH2 USB_WPAN_HCD USBIP_CORE VT6655 VT6656 WIMAX_GDM72XX WLAGS49_H25 W35UND WLAGS49_H2
+%global stgdrvs BCM_WIMAX DGRP FB_XGI FT1000 IDE_PHISON LINE6_USB LTE_GDM724X NET_VENDOR_SILICOM PRISM2_USB R8188EU RTL8192U RTS5139 SOLO6X10 SPEAKUP TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 TRANZPORT USB_ENESTORAGE USB_SERIAL_QUATECH2 USB_WPAN_HCD USBIP_CORE VT6655 VT6656 WIMAX_GDM72XX WLAGS49_H25 W35UND WLAGS49_H2
# makes handling for rc kernels a whole lot easier:
#global prever rc8
Name: staging-kmod-addons
-Version: 3.14.2
+Version: 3.15.4
Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
Summary: Documentation and shared parts for the kmod-staging packages
@@ -144,6 +144,11 @@
%changelog
+* Sun Jul 13 2014 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.15.4-1
+- Update to 3.15.4
+- drop ECHI and R8187SE (left)
+- adjust downloadscript for file movements
+
* Wed Apr 30 2014 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.14.2-1
- Update to 3.14.2
- remove ZRAM and ZSMALLOC, as they left staging
9 years, 9 months
rpms/staging-kmod/F-20 .cvsignore, 1.11, 1.12 sources, 1.11, 1.12 staging-kmod.spec, 1.60, 1.61
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/staging-kmod/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv20687
Modified Files:
.cvsignore sources staging-kmod.spec
Log Message:
* Sun Jul 13 2014 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.15.4-1
- Update to 3.15.4
- drop ECHI and R8187SE (left)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-20/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 30 Apr 2014 11:35:51 -0000 1.11
+++ .cvsignore 13 Jul 2014 13:54:09 -0000 1.12
@@ -1 +1 @@
-linux-staging-3.14.2.tar.xz
+linux-staging-3.15.4.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-20/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 30 Apr 2014 11:35:51 -0000 1.11
+++ sources 13 Jul 2014 13:54:09 -0000 1.12
@@ -1 +1 @@
-c8c1e4c64c1e5fbe482e3c2e956d43a8 linux-staging-3.14.2.tar.xz
+998298567f41b99c223016dda0940855 linux-staging-3.15.4.tar.xz
Index: staging-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/staging-kmod/F-20/staging-kmod.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- staging-kmod.spec 8 Jul 2014 11:33:26 -0000 1.60
+++ staging-kmod.spec 13 Jul 2014 13:54:09 -0000 1.61
@@ -1,7 +1,8 @@
# akmods not supported
# which drivers to built
-%global stgdrvs BCM_WIMAX DGRP ECHO FB_XGI FT1000 IDE_PHISON LINE6_USB LTE_GDM724X NET_VENDOR_SILICOM PRISM2_USB R8187SE R8188EU RTL8192U RTS5139 SOLO6X10 SPEAKUP TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 TRANZPORT USB_ENESTORAGE USB_SERIAL_QUATECH2 USB_WPAN_HCD USBIP_CORE VT6655 VT6656 WIMAX_GDM72XX WLAGS49_H25 W35UND WLAGS49_H2
+%global stgdrvs BCM_WIMAX DGRP FB_XGI FT1000 IDE_PHISON LINE6_USB LTE_GDM724X NET_VENDOR_SILICOM PRISM2_USB R8188EU RTL8192U RTS5139 SOLO6X10 SPEAKUP TOUCHSCREEN_CLEARPAD_TM1217 TOUCHSCREEN_SYNAPTICS_I2C_RMI4 TRANZPORT USB_ENESTORAGE USB_SERIAL_QUATECH2 USB_WPAN_HCD USBIP_CORE VT6655 VT6656 WIMAX_GDM72XX WLAGS49_H25 W35UND WLAGS49_H2
+
%ifnarch %{arm}
%global stgdrvs %{stgdrvs} SLICOSS ET131X
%endif
@@ -24,8 +25,8 @@
#global prever rc8
Name: staging-kmod
-Version: 3.14.2
-Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}.10
+Version: 3.15.4
+Release: %{?prever:0.}1%{?prever:.%{prever}}%{?dist}
Summary: Selected kernel modules from linux-staging
Group: System Environment/Kernel
@@ -55,7 +56,7 @@
%setup -q -c -T -a 0
# disable drivers that are enabled in Fedora's kernel, as those otherweise would get build
-sed -i '/.CRYSTALH/ d; /.FIREWIRE_SERIAL/ d; /.LIRC/ d; /.R8712U/ d; /.RTL8192E/ d; /.IMX/ d; /.DWC2/ d;' $(find linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/ -name 'Makefile')
+sed -i '/.CRYSTALH/ d; /.FIREWIRE_SERIAL/ d; /.LIRC/ d; /.R8712U/ d; /.RTL8192E/ d; /.R8723AU/ d; /.IMX/ d; /.DWC2/ d;' $(find linux-staging-%{version}%{?prever:-%{prever}}/drivers/staging/ -name 'Makefile')
# broken in 3.13
sed -i 's!#include "dot11d.h"!#include "ieee80211/dot11d.h"!' linux-staging-%{version}/drivers/staging/rtl8192u/{r8192U_core.c,r8192U_wx.c,r819xU_phy.c}
@@ -74,7 +75,7 @@
make %{?_smp_mflags} -C "${kernel_version##*___}" SUBDIRS=${PWD}/_kmod_build_${kernel_version%%___*}/drivers/staging/
newcount=$(find ${PWD}/_kmod_build_${kernel_version%%___*}/ -name '*.ko' | wc -l)
if (( ${oldcount} != ${newcount} )); then
- echo "Modules build when not should get build; aborting" >&2
+ echo "Modules build when none should get build; aborting" >&2
exit 1
fi
@@ -149,32 +150,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
-* Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 3.14.2-1.10
-- Rebuilt for kernel
-
-* Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 3.14.2-1.9
-- Rebuilt for kernel
-
-* Tue Jul 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 3.14.2-1.8
-- Rebuilt for kernel
-
-* Tue Jun 17 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 3.14.2-1.7
-- Rebuilt for kernel
-
-* Fri Jun 13 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 3.14.2-1.6
-- Rebuilt for kernel
-
-* Sun Jun 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 3.14.2-1.5
-- Rebuilt for kernel
-
-* Tue Jun 03 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 3.14.2-1.4
-- Rebuilt for kernel
-
-* Thu May 15 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 3.14.2-1.3
-- Rebuilt for kernel
-
-* Thu May 08 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 3.14.2-1.2
-- Rebuilt for kernel
+* Sun Jul 13 2014 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.15.4-1
+- Update to 3.15.4
+- drop ECHI and R8187SE (left)
* Wed Apr 30 2014 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.14.2-1
- Update to 3.14.2
9 years, 9 months
rpms/caja-dropbox/devel caja-dropbox.spec,1.6,1.7
by Wolfgang Ulbrich
Author: raveit65
Update of /cvs/nonfree/rpms/caja-dropbox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19757
Modified Files:
caja-dropbox.spec
Log Message:
* Sun Jul 13 2014 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.6.0-6
- bump version to fix build
Index: caja-dropbox.spec
===================================================================
RCS file: /cvs/nonfree/rpms/caja-dropbox/devel/caja-dropbox.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- caja-dropbox.spec 13 Jul 2014 13:19:02 -0000 1.6
+++ caja-dropbox.spec 13 Jul 2014 13:21:43 -0000 1.7
@@ -1,7 +1,7 @@
Summary: Dropbox extension for caja
Name: caja-dropbox
Version: 1.6.0
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv3+ and CC-BY-ND
Group: User Interface/Desktops
URL: https://linux.dropbox.com
@@ -83,6 +83,9 @@
%changelog
+* Sun Jul 13 2014 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.6.0-6
+- bump version to fix build
+
* Sun Jul 13 2014 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.6.0-5
- try use a fake X session to find pygtk2 BR
9 years, 9 months
rpms/caja-dropbox/devel caja-dropbox.spec,1.5,1.6
by Wolfgang Ulbrich
Author: raveit65
Update of /cvs/nonfree/rpms/caja-dropbox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19589
Modified Files:
caja-dropbox.spec
Log Message:
* Sun Jul 13 2014 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.6.0-5
- try use a fake X session to find pygtk2 BR
Index: caja-dropbox.spec
===================================================================
RCS file: /cvs/nonfree/rpms/caja-dropbox/devel/caja-dropbox.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- caja-dropbox.spec 13 Jul 2014 13:12:54 -0000 1.5
+++ caja-dropbox.spec 13 Jul 2014 13:19:02 -0000 1.6
@@ -1,26 +1,29 @@
Summary: Dropbox extension for caja
Name: caja-dropbox
Version: 1.6.0
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv3+ and CC-BY-ND
Group: User Interface/Desktops
URL: https://linux.dropbox.com
Source0: https://linux.dropbox.com/packages/nautilus-dropbox-%{version}.tar.bz2
-# script binary with serialize images
-Source1: dropbox
Patch0: caja-dropbox_fix_autoconf-automake_deprecations.patch
Patch1: caja-dropbox_nautilus_to_caja.patch
-Patch2: caja-dropbox_disable-creation-of-dropbox-script-binary.patch
-Patch3: caja-dropbox_fix-pygtk-in-configure.patch
-BuildRequires: mate-file-manager-devel
+BuildRequires: caja-devel
BuildRequires: python-docutils
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
+BuildRequires: pygobject2-devel
+BuildRequires: pygtk2-devel
-Requires: mate-file-manager-extensions
+# Run a fake X session
+BuildRequires: xorg-x11-server-Xvfb
+BuildRequires: xorg-x11-xauth
+BuildRequires: zlib-devel
+
+Requires: caja-extensions
Requires: pygtk2
Requires: hicolor-icon-theme
@@ -34,23 +37,17 @@
%patch0 -p1 -b .deprecations
%patch1 -p1 -b .caja
-%patch2 -p1 -b .disable-creation
autoreconf -i -f
-%patch3 -p1 -b .pygtk
-
-cp %{SOURCE1} dropbox
%build
-%configure
+# xvfb-run is needed to find pygtk2
+xvfb-run -a ./configure
-make %{?_smp_mflags}
+xvfb-run -a make %{?_smp_mflags}
%install
-make install DESTDIR=$RPM_BUILD_ROOT
-
-mkdir -m 755 -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/dropbox
+%{make_install}
find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
@@ -86,6 +83,9 @@
%changelog
+* Sun Jul 13 2014 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.6.0-5
+- try use a fake X session to find pygtk2 BR
+
* Sun Jul 21 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.6.0-4
- don't use fake X session for build server
- add script binary with serialize images
9 years, 9 months
rpms/caja-dropbox/devel caja-dropbox.spec,1.4,1.5
by Wolfgang Ulbrich
Author: raveit65
Update of /cvs/nonfree/rpms/caja-dropbox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv19410
Modified Files:
caja-dropbox.spec
Log Message:
reverting to version 1.3
Index: caja-dropbox.spec
===================================================================
RCS file: /cvs/nonfree/rpms/caja-dropbox/devel/caja-dropbox.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- caja-dropbox.spec 13 Jul 2014 11:46:19 -0000 1.4
+++ caja-dropbox.spec 13 Jul 2014 13:12:54 -0000 1.5
@@ -1,35 +1,28 @@
Summary: Dropbox extension for caja
Name: caja-dropbox
Version: 1.6.0
-Release: 5%{?dist}
+Release: 4%{?dist}
License: GPLv3+ and CC-BY-ND
Group: User Interface/Desktops
URL: https://linux.dropbox.com
Source0: https://linux.dropbox.com/packages/nautilus-dropbox-%{version}.tar.bz2
# script binary with serialize images
-#Source1: dropbox
+Source1: dropbox
Patch0: caja-dropbox_fix_autoconf-automake_deprecations.patch
Patch1: caja-dropbox_nautilus_to_caja.patch
-#Patch2: caja-dropbox_disable-creation-of-dropbox-script-binary.patch
-#Patch3: caja-dropbox_fix-pygtk-in-configure.patch
+Patch2: caja-dropbox_disable-creation-of-dropbox-script-binary.patch
+Patch3: caja-dropbox_fix-pygtk-in-configure.patch
-BuildRequires: caja-devel
+BuildRequires: mate-file-manager-devel
BuildRequires: python-docutils
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
-BuildRequires: pygobject2-devel
-BuildRequires: pygtk2-devel
-# Run a fake X session
-BuildRequires: xorg-x11-server-Xvfb
-BuildRequires: xorg-x11-xauth
-BuildRequires: zlib-devel
-
-Requires: caja-extensions
-Requires: pygtk2
-Requires: hicolor-icon-theme
+Requires: mate-file-manager-extensions
+Requires: pygtk2
+Requires: hicolor-icon-theme
%description
Dropbox extension for caja file manager
@@ -41,28 +34,23 @@
%patch0 -p1 -b .deprecations
%patch1 -p1 -b .caja
-#%patch2 -p1 -b .disable-creation
+%patch2 -p1 -b .disable-creation
autoreconf -i -f
-#%patch3 -p1 -b .pygtk
+%patch3 -p1 -b .pygtk
-#cp %{SOURCE1} dropbox
+cp %{SOURCE1} dropbox
%build
-#%configure
+%configure
-#make %{?_smp_mflags}
-
-# xvfb-run is needed to find pygtk2
-xvfb-run -a ./configure
-
-xvfb-run -a make %{?_smp_mflags}
+make %{?_smp_mflags}
%install
-%{make_install}
+make install DESTDIR=$RPM_BUILD_ROOT
-#mkdir -m 755 -p $RPM_BUILD_ROOT%{_bindir}
-#install -m 755 -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/dropbox
+mkdir -m 755 -p $RPM_BUILD_ROOT%{_bindir}
+install -m 755 -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/dropbox
find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
@@ -98,10 +86,6 @@
%changelog
-* Sun Jul 13 2014 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.6.0-5
-- try use a fake X session to find pygtk2 BR again
-- adjustments for caja renaming
-
* Sun Jul 21 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.6.0-4
- don't use fake X session for build server
- add script binary with serialize images
9 years, 9 months
rpms/caja-dropbox/devel caja-dropbox.spec,1.3,1.4
by Wolfgang Ulbrich
Author: raveit65
Update of /cvs/nonfree/rpms/caja-dropbox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17561
Modified Files:
caja-dropbox.spec
Log Message:
* Sun Jul 13 2014 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.6.0-5
- try use a fake X session to find pygtk2 BR again
- adjustments for caja renaming
Index: caja-dropbox.spec
===================================================================
RCS file: /cvs/nonfree/rpms/caja-dropbox/devel/caja-dropbox.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- caja-dropbox.spec 21 Jul 2013 14:15:06 -0000 1.3
+++ caja-dropbox.spec 13 Jul 2014 11:46:19 -0000 1.4
@@ -1,28 +1,35 @@
Summary: Dropbox extension for caja
Name: caja-dropbox
Version: 1.6.0
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv3+ and CC-BY-ND
Group: User Interface/Desktops
URL: https://linux.dropbox.com
Source0: https://linux.dropbox.com/packages/nautilus-dropbox-%{version}.tar.bz2
# script binary with serialize images
-Source1: dropbox
+#Source1: dropbox
Patch0: caja-dropbox_fix_autoconf-automake_deprecations.patch
Patch1: caja-dropbox_nautilus_to_caja.patch
-Patch2: caja-dropbox_disable-creation-of-dropbox-script-binary.patch
-Patch3: caja-dropbox_fix-pygtk-in-configure.patch
+#Patch2: caja-dropbox_disable-creation-of-dropbox-script-binary.patch
+#Patch3: caja-dropbox_fix-pygtk-in-configure.patch
-BuildRequires: mate-file-manager-devel
+BuildRequires: caja-devel
BuildRequires: python-docutils
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
+BuildRequires: pygobject2-devel
+BuildRequires: pygtk2-devel
-Requires: mate-file-manager-extensions
-Requires: pygtk2
-Requires: hicolor-icon-theme
+# Run a fake X session
+BuildRequires: xorg-x11-server-Xvfb
+BuildRequires: xorg-x11-xauth
+BuildRequires: zlib-devel
+
+Requires: caja-extensions
+Requires: pygtk2
+Requires: hicolor-icon-theme
%description
Dropbox extension for caja file manager
@@ -34,23 +41,28 @@
%patch0 -p1 -b .deprecations
%patch1 -p1 -b .caja
-%patch2 -p1 -b .disable-creation
+#%patch2 -p1 -b .disable-creation
autoreconf -i -f
-%patch3 -p1 -b .pygtk
+#%patch3 -p1 -b .pygtk
-cp %{SOURCE1} dropbox
+#cp %{SOURCE1} dropbox
%build
-%configure
+#%configure
-make %{?_smp_mflags}
+#make %{?_smp_mflags}
+
+# xvfb-run is needed to find pygtk2
+xvfb-run -a ./configure
+
+xvfb-run -a make %{?_smp_mflags}
%install
-make install DESTDIR=$RPM_BUILD_ROOT
+%{make_install}
-mkdir -m 755 -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/dropbox
+#mkdir -m 755 -p $RPM_BUILD_ROOT%{_bindir}
+#install -m 755 -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/dropbox
find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
@@ -86,6 +98,10 @@
%changelog
+* Sun Jul 13 2014 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.6.0-5
+- try use a fake X session to find pygtk2 BR again
+- adjustments for caja renaming
+
* Sun Jul 21 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.6.0-4
- don't use fake X session for build server
- add script binary with serialize images
9 years, 9 months
rpms/mplayer/devel .cvsignore, 1.42, 1.43 mplayer-snapshot.sh, 1.24, 1.25 mplayer.spec, 1.86, 1.87 sources, 1.43, 1.44
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/mplayer/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv13094
Modified Files:
.cvsignore mplayer-snapshot.sh mplayer.spec sources
Log Message:
* Sat Jul 12 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.1-25.20140711svn
- 20140711 snapshot
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore 27 Mar 2014 02:54:47 -0000 1.42
+++ .cvsignore 12 Jul 2014 08:24:55 -0000 1.43
@@ -1,2 +1,2 @@
-Blue-1.8.tar.bz2
-mplayer-export-2014-03-27.tar.bz2
+Blue-1.10.tar.bz2
+mplayer-export-2014-07-11.tar.bz2
Index: mplayer-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-snapshot.sh,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mplayer-snapshot.sh 27 Mar 2014 02:54:48 -0000 1.24
+++ mplayer-snapshot.sh 12 Jul 2014 08:24:55 -0000 1.25
@@ -13,7 +13,7 @@
unset CDPATH
pwd=$(pwd)
svn=$(date +%Y-%m-%d)
-svn=2014-03-27
+svn=2014-07-11
dirname=mplayer-export-$svn
mplayer_rev={$svn}
#mplayer_rev=HEAD
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -r1.86 -r1.87
--- mplayer.spec 27 Mar 2014 02:54:48 -0000 1.86
+++ mplayer.spec 12 Jul 2014 08:24:55 -0000 1.87
@@ -1,12 +1,12 @@
%define codecdir %{_libdir}/codecs
-%define pre 20140327svn
+%define pre 20140711svn
%define svn 1
-%define svnbuild 2014-03-27
+%define svnbuild 2014-07-11
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.1
-Release: 24.%{?pre}%{?dist}
+Release: 25.%{?pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
%if 0%{!?_without_amr:1}
@@ -21,7 +21,7 @@
%else
Source0: http://www.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}%{?pre}.tar.xz
%endif
-Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.8.tar.bz2
+Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.10.tar.bz2
Source10: mplayer-snapshot.sh
# set defaults for Fedora
Patch0: %{name}-config.patch
@@ -380,6 +380,9 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Sat Jul 12 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.1-25.20140711svn
+- 20140711 snapshot
+
* Thu Mar 27 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.1-24.20140327svn
- 20140327 snapshot
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources 27 Mar 2014 02:54:48 -0000 1.43
+++ sources 12 Jul 2014 08:24:55 -0000 1.44
@@ -1,2 +1,2 @@
-340368f4e33f767d9df109990fb29c02 Blue-1.8.tar.bz2
-1e1f961f11ad329edfd9ebd6420eee4c mplayer-export-2014-03-27.tar.bz2
+d0d7baf1e84ba95f4456c51b50d99b14 Blue-1.10.tar.bz2
+fbbe54799cc0f872afe785a1fffec8cb mplayer-export-2014-07-11.tar.bz2
9 years, 9 months
rpms/mplayer/F-20 .cvsignore, 1.42, 1.43 mplayer-snapshot.sh, 1.24, 1.25 mplayer.spec, 1.82, 1.83 sources, 1.43, 1.44
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/mplayer/F-20
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12692
Modified Files:
.cvsignore mplayer-snapshot.sh mplayer.spec sources
Log Message:
* Sat Jul 12 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.1-22.20140414svn
- 20140414 snapshot
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-20/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- .cvsignore 27 Mar 2014 03:03:28 -0000 1.42
+++ .cvsignore 12 Jul 2014 08:14:35 -0000 1.43
@@ -1,2 +1,2 @@
-Blue-1.8.tar.bz2
-mplayer-export-2014-03-27.tar.bz2
+Blue-1.10.tar.bz2
+mplayer-export-2014-04-14.tar.bz2
Index: mplayer-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-20/mplayer-snapshot.sh,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mplayer-snapshot.sh 27 Mar 2014 03:03:28 -0000 1.24
+++ mplayer-snapshot.sh 12 Jul 2014 08:14:35 -0000 1.25
@@ -13,7 +13,7 @@
unset CDPATH
pwd=$(pwd)
svn=$(date +%Y-%m-%d)
-svn=2014-03-27
+svn=2014-04-14
dirname=mplayer-export-$svn
mplayer_rev={$svn}
#mplayer_rev=HEAD
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-20/mplayer.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -r1.82 -r1.83
--- mplayer.spec 27 Mar 2014 03:03:28 -0000 1.82
+++ mplayer.spec 12 Jul 2014 08:14:35 -0000 1.83
@@ -1,12 +1,12 @@
%define codecdir %{_libdir}/codecs
-%define pre 20140327svn
+%define pre 20140414svn
%define svn 1
-%define svnbuild 2014-03-27
+%define svnbuild 2014-04-14
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.1
-Release: 21.%{?pre}%{?dist}
+Release: 22.%{?pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
%if 0%{!?_without_amr:1}
@@ -380,6 +380,9 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Sat Jul 12 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.1-22.20140414svn
+- 20140414 snapshot
+
* Thu Mar 27 2014 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.1-21.20140327svn
- 20140327 snapshot
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-20/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sources 27 Mar 2014 03:03:28 -0000 1.43
+++ sources 12 Jul 2014 08:14:35 -0000 1.44
@@ -1,2 +1,2 @@
-340368f4e33f767d9df109990fb29c02 Blue-1.8.tar.bz2
-1e1f961f11ad329edfd9ebd6420eee4c mplayer-export-2014-03-27.tar.bz2
+d0d7baf1e84ba95f4456c51b50d99b14 Blue-1.10.tar.bz2
+8932bba01f855abbbeedd666fdd32c98 mplayer-export-2014-04-14.tar.bz2
9 years, 9 months