rpms/xbill/devel xbill.spec,1.3,1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/xbill/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12097
Modified Files:
xbill.spec
Log Message:
Add BR for autoreconf
Index: xbill.spec
===================================================================
RCS file: /cvs/free/rpms/xbill/devel/xbill.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xbill.spec 3 Mar 2013 21:49:37 -0000 1.3
+++ xbill.spec 21 Jul 2013 09:31:20 -0000 1.4
@@ -1,6 +1,6 @@
Name: xbill
Version: 2.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Stop Bill from loading his OS into all the computers
Group: Amusements/Games
@@ -17,6 +17,8 @@
Patch3: %{name}-2.1-dropsgid.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: libtool
+
BuildRequires: gtk2-devel
BuildRequires: desktop-file-utils
BuildRequires: ImageMagick
@@ -100,6 +102,9 @@
%changelog
+* Sun Jul 21 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.1-5
+- Add BR for autoreconf
+
* Sun Mar 03 2013 Nicolas Chauvet <kwizart(a)gmail.com> - 2.1-4
- Mass rebuilt for Fedora 19 Features
10 years, 9 months
rpms/caja-dropbox/devel caja-dropbox.spec,1.1,1.2
by Wolfgang Ulbrich
Author: raveit65
Update of /cvs/nonfree/rpms/caja-dropbox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv6495
Modified Files:
caja-dropbox.spec
Log Message:
fix configure command
Index: caja-dropbox.spec
===================================================================
RCS file: /cvs/nonfree/rpms/caja-dropbox/devel/caja-dropbox.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- caja-dropbox.spec 20 Jul 2013 21:34:11 -0000 1.1
+++ caja-dropbox.spec 21 Jul 2013 08:59:47 -0000 1.2
@@ -39,10 +39,8 @@
autoreconf -i -f
%build
-export CFLAGS="%{optflags}"
-export CXXFLAGS="%{optflags}"
# xvfb-run is needed to find pygtk2
-xvfb-run -a ./configure
+xvfb-run -a ./configure CFLAGS="$RPM_OPT_FLAGS"
xvfb-run -a make %{?_smp_mflags}
10 years, 9 months
rpms/nvidia-kmod/devel kernel_v3.10.patch, 1.3, 1.4 nvidia-kmod.spec, 1.130, 1.131
by Leigh Scott
Author: leigh123linux
Update of /cvs/nonfree/rpms/nvidia-kmod/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv26041
Modified Files:
kernel_v3.10.patch nvidia-kmod.spec
Log Message:
* Sun Jul 21 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:325.08-4
- redo kernel patch
kernel_v3.10.patch:
nv-i2c.c | 9 -
nv-linux.h | 4
nv-procfs.c | 372 ++++++++++++++++++++++++++++++------------------------------
3 files changed, 194 insertions(+), 191 deletions(-)
Index: kernel_v3.10.patch
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/kernel_v3.10.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kernel_v3.10.patch 16 Jul 2013 16:53:03 -0000 1.3
+++ kernel_v3.10.patch 21 Jul 2013 08:19:07 -0000 1.4
@@ -1,6 +1,6 @@
--- a/kernel/nv-i2c.c
+++ b/kernel/nv-i2c.c
-@@ -324,13 +324,10 @@ BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
+@@ -249,13 +249,10 @@ BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data)
if (!pI2cAdapter) return FALSE;
// attempt release with the OS
@@ -19,15 +19,574 @@
}
--- a/kernel/nv-procfs.c
+++ b/kernel/nv-procfs.c
-@@ -14,6 +14,8 @@
- #include "os-interface.h"
- #include "nv-linux.h"
+@@ -60,60 +60,41 @@ static char nv_registry_keys[NV_MAX_REGISTRY_KEYS_LENGTH];
+ __entry; \
+ })
-+#undef CONFIG_PROC_FS
+-#define NV_CREATE_PROC_FILE(name,parent,__read_proc, \
+- __write_proc,__fops,__data) \
+- ({ \
+- struct proc_dir_entry *__entry; \
+- int __mode = (S_IFREG | S_IRUGO); \
+- if ((NvUPtr)(__write_proc) != 0) \
+- __mode |= S_IWUSR; \
+- __entry = NV_CREATE_PROC_ENTRY(name, __mode, parent); \
+- if (__entry != NULL) \
+- { \
+- if ((NvUPtr)(__read_proc) != 0) \
+- __entry->read_proc = (__read_proc); \
+- if ((NvUPtr)(__write_proc) != 0) \
+- { \
+- __entry->write_proc = (__write_proc); \
+- __entry->proc_fops = (__fops); \
+- } \
+- __entry->data = (__data); \
+- } \
+- __entry; \
+- })
++#define NV_PROC_RW (S_IFREG|S_IRUGO|S_IWUSR)
++#define NV_PROC_RO (S_IFREG|S_IRUGO)
+
+ #define NV_CREATE_PROC_DIR(name,parent) \
+ ({ \
+ struct proc_dir_entry *__entry; \
+ int __mode = (S_IFDIR | S_IRUGO | S_IXUGO); \
+- __entry = NV_CREATE_PROC_ENTRY(name, __mode, parent); \
++ __entry = proc_mkdir_mode(name, __mode, parent); \
+ __entry; \
+ })
+
++#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,9,255)
++static inline void *PDE_DATA(const struct inode *inode) {
++ return PDE(inode)->data;
++}
++#endif
+
- #if defined(CONFIG_PROC_FS)
+ #define NV_PROC_WRITE_BUFFER_SIZE (64 * RM_PAGE_SIZE)
+
+ static int
+-nv_procfs_read_gpu_info(
+- char *page,
+- char **start,
+- off_t off,
+- int count,
+- int *eof,
+- void *data
++nv_procfs_show_gpu_info(
++ struct seq_file *m,
++ void *v
+ )
+ {
+- nv_state_t *nv = data;
++ nv_state_t *nv = m->private;
+ nv_linux_state_t *nvl = NV_GET_NVL_FROM_NV_STATE(nv);
+ struct pci_dev *dev = nvl->dev;
+ char *type, *fmt, tmpstr[NV_DEVICE_NAME_LENGTH];
+- int len = 0, status;
++ int status;
+ NvU8 *uuid;
+ NvU32 vbios_rev1, vbios_rev2, vbios_rev3, vbios_rev4, vbios_rev5;
+ NvU32 fpga_rev1, fpga_rev2, fpga_rev3;
+ nv_stack_t *sp = NULL;
+
+- *eof = 1;
+-
+ NV_KMEM_CACHE_ALLOC_STACK(sp);
+ if (sp == NULL)
+ {
+@@ -134,31 +115,31 @@ nv_procfs_read_gpu_info(
+ if (rm_get_device_name(sp, nv, dev->device, dev->subsystem_vendor,
+ dev->subsystem_device, NV_DEVICE_NAME_LENGTH,
+ tmpstr) != RM_OK)
+- {
++ {
+ strcpy (tmpstr, "Unknown");
+ }
+ }
+
+- len += sprintf(page+len, "Model: \t\t %s\n", tmpstr);
+- len += sprintf(page+len, "IRQ: \t\t %d\n", nv->interrupt_line);
++ seq_printf(m, "Model: \t\t %s\n", tmpstr);
++ seq_printf(m, "IRQ: \t\t %d\n", nv->interrupt_line);
+
+ if (NV_IS_GVI_DEVICE(nv))
+ {
+ status = rm_gvi_get_firmware_version(sp, nv, &fpga_rev1, &fpga_rev2,
+ &fpga_rev3);
+ if (status != RM_OK)
+- len += sprintf(page+len, "Firmware: \t ????.??.??\n");
++ seq_printf(m, "Firmware: \t ????.??.??\n");
+ else
+ {
+ fmt = "Firmware: \t %x.%x.%x\n";
+- len += sprintf(page+len, fmt, fpga_rev1, fpga_rev2, fpga_rev3);
++ seq_printf(m, fmt, fpga_rev1, fpga_rev2, fpga_rev3);
+ }
+ }
+ else
+ {
+ if (rm_get_gpu_uuid(sp, nv, &uuid, NULL) == RM_OK)
+ {
+- len += sprintf(page+len, "GPU UUID: \t %s\n", (char *)uuid);
++ seq_printf(m, "GPU UUID: \t %s\n", (char *)uuid);
+ os_free_mem(uuid);
+ }
+
+@@ -166,12 +147,12 @@ nv_procfs_read_gpu_info(
+ &vbios_rev3, &vbios_rev4,
+ &vbios_rev5) != RM_OK)
+ {
+- len += sprintf(page+len, "Video BIOS: \t ??.??.??.??.??\n");
++ seq_printf(m, "Video BIOS: \t ??.??.??.??.??\n");
+ }
+ else
+ {
+ fmt = "Video BIOS: \t %02x.%02x.%02x.%02x.%02x\n";
+- len += sprintf(page+len, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
++ seq_printf(m, fmt, vbios_rev1, vbios_rev2, vbios_rev3,
+ vbios_rev4, vbios_rev5);
+ }
+ }
+@@ -180,12 +161,12 @@ nv_procfs_read_gpu_info(
+ type = "PCIe";
+ else
+ type = "PCI";
+- len += sprintf(page+len, "Bus Type: \t %s\n", type);
++ seq_printf(m, "Bus Type: \t %s\n", type);
+
+- len += sprintf(page+len, "DMA Size: \t %d bits\n",
++ seq_printf(m, "DMA Size: \t %d bits\n",
+ nv_count_bits(dev->dma_mask));
+- len += sprintf(page+len, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
+- len += sprintf(page+len, "Bus Location: \t %04x:%02x.%02x.%x\n",
++ seq_printf(m, "DMA Mask: \t 0x%llx\n", dev->dma_mask);
++ seq_printf(m, "Bus Location: \t %04x:%02x.%02x.%x\n",
+ nv->domain, nv->bus, nv->slot, PCI_FUNC(dev->devfn));
+ #if defined(DEBUG)
+ do
+@@ -193,7 +174,7 @@ nv_procfs_read_gpu_info(
+ int j;
+ for (j = 0; j < NV_GPU_NUM_BARS; j++)
+ {
+- len += sprintf(page+len, "BAR%u: \t\t 0x%llx (%lluMB)\n",
++ seq_printf(m, "BAR%u: \t\t 0x%llx (%lluMB)\n",
+ j, nv->bars[j].address, (nv->bars[j].size >> 20));
+ }
+ } while (0);
+@@ -201,26 +182,120 @@ nv_procfs_read_gpu_info(
+
+ NV_KMEM_CACHE_FREE_STACK(sp);
+
+- return len;
++ return 0;
+ }
+
+ static int
+-nv_procfs_read_version(
+- char *page,
+- char **start,
+- off_t off,
+- int count,
+- int *eof,
+- void *data
++nv_procfs_open_gpu_info(
++ struct inode *inode,
++ struct file *file
++)
++{
++ return single_open(file, nv_procfs_show_gpu_info, PDE_DATA(inode));
++}
++
++static const struct file_operations nv_procfs_gpu_info_fops = {
++ .owner = THIS_MODULE,
++ .open = nv_procfs_open_gpu_info,
++ .read = seq_read,
++ .llseek = seq_lseek,
++ .release = single_release,
++};
++
++static int
++nv_procfs_show_version(
++ struct seq_file *m,
++ void *v
++)
++{
++ seq_printf(m, "NVRM version: %s\n", pNVRM_ID);
++ seq_printf(m, "GCC version: %s\n", NV_COMPILER);
++
++ return 0;
++}
++
++static int
++nv_procfs_open_version(
++ struct inode *inode,
++ struct file *file
++)
++{
++ return single_open(file, nv_procfs_show_version, NULL);
++}
++
++static const struct file_operations nv_procfs_version_fops = {
++ .owner = THIS_MODULE,
++ .open = nv_procfs_open_version,
++ .read = seq_read,
++ .llseek = seq_lseek,
++ .release = single_release,
++};
++
++static int
++nv_procfs_show_registry(
++ struct seq_file *m,
++ void *v
++)
++{
++ nv_state_t *nv = m->private;
++ nv_linux_state_t *nvl = NULL;
++ char *registry_keys;
++
++ if (nv != NULL)
++ nvl = NV_GET_NVL_FROM_NV_STATE(nv);
++ registry_keys = ((nvl != NULL) ?
++ nvl->registry_keys : nv_registry_keys);
++
++ seq_printf(m, "Binary: \"%s\"\n", registry_keys);
++
++ return 0;
++}
++
++static ssize_t
++nv_procfs_write_registry(
++ struct file *file,
++ const char __user *buffer,
++ size_t count,
++ loff_t *pos
+ )
+ {
+- int len = 0;
+- *eof = 1;
++ int status = 0;
++ nv_file_private_t *nvfp = NV_GET_FILE_PRIVATE(file);
++ char *proc_buffer;
++ unsigned long bytes_left;
++
++ down(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
++
++ bytes_left = (NV_PROC_WRITE_BUFFER_SIZE - nvfp->off - 1);
++
++ if (count == 0)
++ {
++ status = -EINVAL;
++ goto done;
++ }
++ else if ((bytes_left == 0) || (count > bytes_left))
++ {
++ status = -ENOSPC;
++ goto done;
++ }
++
++ proc_buffer = &((char *)nvfp->data)[nvfp->off];
++
++ if (copy_from_user(proc_buffer, buffer, count))
++ {
++ nv_printf(NV_DBG_ERRORS, "NVRM: failed to copy in proc data!\n");
++ status = -EFAULT;
++ }
++ else
++ {
++ nvfp->proc_data = PDE_DATA(file->f_inode);
++ nvfp->off += count;
++ }
+
+- len += sprintf(page+len, "NVRM version: %s\n", pNVRM_ID);
+- len += sprintf(page+len, "GCC version: %s\n", NV_COMPILER);
++done:
++ up(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
+
+- return len;
++ return ((status < 0) ? status : count);
+ }
+
+ static int
+@@ -233,7 +308,7 @@ nv_procfs_open_registry(
+ nv_stack_t *sp = NULL;
+
+ if (0 == (file->f_mode & FMODE_WRITE))
+- return 0;
++ return single_open(file, nv_procfs_show_registry, PDE_DATA(inode));
+
+ nvfp = nv_alloc_file_private();
+ if (nvfp == NULL)
+@@ -282,6 +357,9 @@ nv_procfs_close_registry(
+ RM_STATUS rm_status;
+ int rc = 0;
+
++ if (0 == (file->f_mode & FMODE_WRITE))
++ return single_release(inode, file);
++
+ nvfp = NV_GET_FILE_PRIVATE(file);
+ if (nvfp == NULL)
+ return 0;
+@@ -346,121 +424,80 @@ done:
+ return rc;
+ }
+
+-static struct file_operations nv_procfs_registry_fops = {
++static const struct file_operations nv_procfs_registry_fops = {
+ .open = nv_procfs_open_registry,
++ .read = seq_read,
++ .llseek = seq_lseek,
++ .write = nv_procfs_write_registry,
+ .release = nv_procfs_close_registry,
+ };
+
+ static int
+-nv_procfs_read_params(
+- char *page,
+- char **start,
+- off_t off,
+- int count,
+- int *eof,
+- void *data
++nv_procfs_show_params(
++ struct seq_file *m,
++ void *v
+ )
+ {
+ unsigned int i;
+- int len = 0;
+ nv_parm_t *entry;
- #include "nv_compiler.h"
+- *eof = 1;
+
+ for (i = 0; (entry = &nv_parms[i])->name != NULL; i++)
+- len += sprintf(page+len, "%s: %u\n", entry->name, *entry->data);
++ seq_printf(m, "%s: %u\n", entry->name, *entry->data);
+
+- len += sprintf(page+len, "RegistryDwords: \"%s\"\n",
++ seq_printf(m, "RegistryDwords: \"%s\"\n",
+ (NVreg_RegistryDwords != NULL) ? NVreg_RegistryDwords : "");
+- len += sprintf(page+len, "RmMsg: \"%s\"\n",
++ seq_printf(m, "RmMsg: \"%s\"\n",
+ (NVreg_RmMsg != NULL) ? NVreg_RmMsg : "");
+- return len;
++ return 0;
+ }
+
+ static int
+-nv_procfs_read_registry(
+- char *page,
+- char **start,
+- off_t off,
+- int count,
+- int *eof,
+- void *data
+-)
++nv_procfs_open_params(
++ struct inode *inode,
++ struct file *file
++)
+ {
+- nv_state_t *nv = data;
+- nv_linux_state_t *nvl = NULL;
+- char *registry_keys;
++ return single_open(file, nv_procfs_show_params, NULL);
++}
+
+- if (nv != NULL)
+- nvl = NV_GET_NVL_FROM_NV_STATE(nv);
+- registry_keys = ((nvl != NULL) ?
+- nvl->registry_keys : nv_registry_keys);
++static const struct file_operations nv_procfs_params_fops = {
++ .owner = THIS_MODULE,
++ .open = nv_procfs_open_params,
++ .read = seq_read,
++ .llseek = seq_lseek,
++ .release = single_release,
++};
+
+- *eof = 1;
+- return sprintf(page, "Binary: \"%s\"\n", registry_keys);
+-}
+
+ static int
+-nv_procfs_write_registry(
+- struct file *file,
+- const char *buffer,
+- unsigned long count,
+- void *data
++nv_procfs_show_text_file(
++ struct seq_file *m,
++ void *v
+ )
+ {
+- int status = 0;
+- nv_file_private_t *nvfp = NV_GET_FILE_PRIVATE(file);
+- char *proc_buffer;
+- unsigned long bytes_left;
+-
+- down(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
+-
+- bytes_left = (NV_PROC_WRITE_BUFFER_SIZE - nvfp->off - 1);
++ seq_printf(m, "%s", (char *)m->private);
+
+- if (count == 0)
+- {
+- status = -EINVAL;
+- goto done;
+- }
+- else if ((bytes_left == 0) || (count > bytes_left))
+- {
+- status = -ENOSPC;
+- goto done;
+- }
+-
+- proc_buffer = &((char *)nvfp->data)[nvfp->off];
+-
+- if (copy_from_user(proc_buffer, buffer, count))
+- {
+- nv_printf(NV_DBG_ERRORS, "NVRM: failed to copy in proc data!\n");
+- status = -EFAULT;
+- }
+- else
+- {
+- nvfp->proc_data = data;
+- nvfp->off += count;
+- }
+-
+-done:
+- up(&nvfp->fops_sp_lock[NV_FOPS_STACK_INDEX_PROCFS]);
+-
+- return ((status < 0) ? status : (int)count);
++ return 0;
+ }
+
+ static int
+-nv_procfs_read_text_file(
+- char *page,
+- char **start,
+- off_t off,
+- int count,
+- int *eof,
+- void *data
++nv_procfs_open_text_file(
++ struct inode *inode,
++ struct file *file
+ )
+ {
+- *eof = 1;
+- return sprintf(page, "%s", (char *)data);
++ return single_open(file, nv_procfs_show_text_file, PDE_DATA(inode));
+ }
+
++static const struct file_operations nv_procfs_text_fops = {
++ .owner = THIS_MODULE,
++ .open = nv_procfs_open_text_file,
++ .read = seq_read,
++ .llseek = seq_lseek,
++ .release = single_release,
++};
++
+ static void
+ nv_procfs_add_text_file(
+ struct proc_dir_entry *parent,
+@@ -468,22 +505,7 @@ nv_procfs_add_text_file(
+ const char *text
+ )
+ {
+- NV_CREATE_PROC_FILE(filename, parent,
+- nv_procfs_read_text_file, NULL, NULL, (void *)text);
+-}
+-
+-static void nv_procfs_unregister_all(struct proc_dir_entry *entry)
+-{
+- while (entry)
+- {
+- struct proc_dir_entry *next = entry->next;
+- if (entry->subdir)
+- nv_procfs_unregister_all(entry->subdir);
+- remove_proc_entry(entry->name, entry->parent);
+- if (entry == proc_nvidia)
+- break;
+- entry = next;
+- }
++ proc_create_data(filename, NV_PROC_RO, parent, &nv_procfs_text_fops, (void *)text);
+ }
+ #endif
+
+@@ -512,26 +534,11 @@ int nv_register_procfs(void)
+ if (!proc_nvidia)
+ goto failed;
+
+- entry = NV_CREATE_PROC_FILE("params", proc_nvidia,
+- nv_procfs_read_params, NULL, NULL, NULL);
++ entry = proc_create("params", NV_PROC_RO, proc_nvidia, &nv_procfs_params_fops);
+ if (!entry)
+ goto failed;
+
+- /*
+- * entry->proc_fops originally points to a constant
+- * structure, so to add more methods for the
+- * binary registry write path, we need to replace the
+- * said entry->proc_fops with a new fops structure.
+- * However, in preparation for this, we need to preserve
+- * the procfs read() and write() operations.
+- */
+- nv_procfs_registry_fops.read = entry->proc_fops->read;
+- nv_procfs_registry_fops.write = entry->proc_fops->write;
+-
+- entry = NV_CREATE_PROC_FILE("registry", proc_nvidia,
+- nv_procfs_read_registry,
+- nv_procfs_write_registry,
+- &nv_procfs_registry_fops, NULL);
++ entry = proc_create("registry", NV_PROC_RW, proc_nvidia, &nv_procfs_registry_fops);
+ if (!entry)
+ goto failed;
+
+@@ -552,8 +559,7 @@ int nv_register_procfs(void)
+
+ nv_procfs_add_text_file(proc_nvidia_patches, "README", __README_patches);
+
+- entry = NV_CREATE_PROC_FILE("version", proc_nvidia,
+- nv_procfs_read_version, NULL, NULL, NULL);
++ entry = proc_create("version", NV_PROC_RO, proc_nvidia, &nv_procfs_version_fops);
+ if (!entry)
+ goto failed;
+
+@@ -570,15 +576,11 @@ int nv_register_procfs(void)
+ if (!proc_nvidia_gpu)
+ goto failed;
+
+- entry = NV_CREATE_PROC_FILE("information", proc_nvidia_gpu,
+- nv_procfs_read_gpu_info, NULL, NULL, nv);
++ entry = proc_create_data("information", NV_PROC_RO, proc_nvidia_gpu, &nv_procfs_gpu_info_fops, nv);
+ if (!entry)
+ goto failed;
+
+- entry = NV_CREATE_PROC_FILE("registry", proc_nvidia_gpu,
+- nv_procfs_read_registry,
+- nv_procfs_write_registry,
+- &nv_procfs_registry_fops, nv);
++ entry = proc_create_data("registry", NV_PROC_RW, proc_nvidia_gpu, &nv_procfs_registry_fops, nv);
+ if (!entry)
+ goto failed;
+ }
+@@ -586,7 +588,7 @@ int nv_register_procfs(void)
+ return 0;
+ #if defined(CONFIG_PROC_FS)
+ failed:
+- nv_procfs_unregister_all(proc_nvidia);
++ remove_proc_subtree("nvidia", proc_nvidia);
+ return -1;
+ #endif
+ }
+@@ -594,6 +596,6 @@ failed:
+ void nv_unregister_procfs(void)
+ {
+ #if defined(CONFIG_PROC_FS)
+- nv_procfs_unregister_all(proc_nvidia);
++ remove_proc_subtree("nvidia", proc_nvidia);
+ #endif
+ }
--- a/kernel/nv-linux.h
+++ b/kernel/nv-linux.h
@@ -957,7 +957,11 @@ static inline int nv_execute_on_all_cpus
Index: nvidia-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/nvidia-kmod/devel/nvidia-kmod.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- nvidia-kmod.spec 16 Jul 2013 16:53:03 -0000 1.130
+++ nvidia-kmod.spec 21 Jul 2013 08:19:08 -0000 1.131
@@ -9,7 +9,7 @@
Epoch: 1
Version: 325.08
# Taken over by kmodtool
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -85,6 +85,9 @@
%changelog
+* Sun Jul 21 2013 Leigh Scott <leigh123linux(a)googlemail.com> - 1:325.08-4
+- redo kernel patch
+
* Tue Jul 16 2013 leigh scott <leigh123linux(a)googlemail.com> - 1:325.08-3
- add better patch for 3.10 and 3.11 git kernels
10 years, 9 months
rpms/caja-dropbox/devel caja-dropbox.spec, NONE, 1.1 caja-dropbox_fix_autoconf-automake_deprecations.patch, NONE, 1.1 caja-dropbox_nautilus_to_caja.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Wolfgang Ulbrich
Author: raveit65
Update of /cvs/nonfree/rpms/caja-dropbox/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv25364/devel
Modified Files:
.cvsignore sources
Added Files:
caja-dropbox.spec
caja-dropbox_fix_autoconf-automake_deprecations.patch
caja-dropbox_nautilus_to_caja.patch
Log Message:
--- NEW FILE caja-dropbox.spec ---
Summary: Dropbox extension for caja
Name: caja-dropbox
Version: 1.6.0
Release: 3%{?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
Patch0: caja-dropbox_fix_autoconf-automake_deprecations.patch
Patch1: caja-dropbox_nautilus_to_caja.patch
BuildRequires: mate-file-manager-devel
BuildRequires: python-docutils
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
# Run a fake X session
BuildRequires: xorg-x11-server-Xvfb
BuildRequires: xorg-x11-xauth
BuildRequires: zlib-devel
Requires: mate-file-manager-extensions
Requires: pygtk2
Requires: hicolor-icon-theme
%description
Dropbox extension for caja file manager
Dropbox allows you to sync your files online and across
your computers automatically.
%prep
%setup -q -n nautilus-dropbox-%{version}
%patch0 -p1 -b .deprecations
%patch1 -p1 -b .caja
autoreconf -i -f
%build
export CFLAGS="%{optflags}"
export CXXFLAGS="%{optflags}"
# xvfb-run is needed to find pygtk2
xvfb-run -a ./configure
xvfb-run -a make %{?_smp_mflags}
%install
make install DESTDIR=$RPM_BUILD_ROOT
find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
%check
desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/dropbox.desktop
%post
/sbin/ldconfig
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
/sbin/ldconfig
if [ $1 -eq 0 ] ; then
/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
fi
%posttrans
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%files
%doc AUTHORS COPYING NEWS README
%{_bindir}/dropbox
%{_datadir}/caja-dropbox/
%{_datadir}/icons/hicolor/*
%{_mandir}/man1/dropbox.1.gz
%{_datadir}/applications/dropbox.desktop
%{_libdir}/caja/extensions-2.0/libcaja-dropbox.so
%changelog
* Sat Jul 20 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.6.0-3
- add exports
* Thu May 16 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.6.0-2
- use a fake X session to find pygtk2 BR, fix build server issue
- fix autoconf/automake deprecations
* Sun May 12 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 1.6.0-1
- add require hicolor-icon-theme
- remove useless libmatenotify BR
- clean up BR's
- switch to current upstream source
- fix licence information
* Thu Mar 21 2013 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.7.1-2
- initial build for fedora
* Fri Nov 16 2012 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.7.1-1
- build against official fedora mate-desktop
- remove epoch
- test remove libmate require
- clean BR
- add rpm scriptlets
- improve spec file
* Mon Aug 27 2012 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.7.1-0100
- build for f18
* Thu Jul 05 2012 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.7.1-4
- switch to Mate-Desktop source
* Thu Feb 23 2012 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.7.1-3
- fixed build error for i686
* Mon Feb 13 2012 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.7.1-2
- rebuild for enable builds for .i686
* Thu Jan 19 2012 Wolfgang Ulbrich <chat-to-me(a)raveit.de> - 0.7.1-1
- start building for caja
caja-dropbox_fix_autoconf-automake_deprecations.patch:
configure.ac | 132 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
configure.in | 132 --------------------------------------------------------
src/Makefile.am | 2
3 files changed, 133 insertions(+), 133 deletions(-)
--- NEW FILE caja-dropbox_fix_autoconf-automake_deprecations.patch ---
diff -uprN nautilus-dropbox-1.6.0-orig/configure.ac nautilus-dropbox-1.6.0/configure.ac
--- nautilus-dropbox-1.6.0-orig/configure.ac 1970-01-01 01:00:00.000000000 +0100
+++ nautilus-dropbox-1.6.0/configure.ac 2013-05-16 14:12:22.924974252 +0200
@@ -0,0 +1,132 @@
+# Initialization
+
+AC_INIT([nautilus-dropbox],1.6.0)
+
+AM_INIT_AUTOMAKE
+
+AC_PREFIX_DEFAULT(/usr)
+
+AC_CONFIG_HEADERS([config.h])
+
+# not ready for i18n yet
+#AC_PROG_INTLTOOL([0.29])
+
+# Dependency checks
+NAUTILUS_REQUIRED=2.16.0
+GLIB_REQUIRED=2.14.0
+
+# Used programs
+AC_PROG_CC
+AM_PROG_LIBTOOL
+
+# Check for pkg-config
+AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
+AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+if test "x$HAVE_PKGCONFIG" = "xno"; then
+ AC_MSG_ERROR(you need to have pkgconfig installed !)
+fi
+
+PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED)
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
+
+AC_PATH_PROG([PYTHON], [python])
+
+AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
+AC_SUBST(RST2MAN)
+
+# define module checking macro
+AC_DEFUN([PYTHON_CHECK_MODULE], [
+AC_MSG_CHECKING([for $1])
+
+cat <<EOF | python
+try:
+ import $2
+except:
+ exit(1)
+else:
+ exit(0)
+EOF
+
+if test $? -ne 0; then
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([couldn't find $1])
+else
+ AC_MSG_RESULT([yes])
+fi
+])
+
+PYTHON_CHECK_MODULE(pygtk, gtk)
+PYTHON_CHECK_MODULE(gobject, gobject)
+PYTHON_CHECK_MODULE(docutils, docutils)
+
+# Make dependency CFLAGS and LIBS available
+AC_SUBST(NAUTILUS_CFLAGS)
+AC_SUBST(NAUTILUS_LIBS)
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+
+# lol stolen from the automake manual
+AC_ARG_ENABLE([debug],
+[ --enable-debug Turn on debugging],
+[case "${enableval}" in
+yes) debug=true ;;
+no) debug=false ;;
+*) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;
+esac],[debug=false])
+AM_CONDITIONAL([DEBUG], [test x$debug = xtrue])
+
+AC_ARG_WITH(nautilus-extension-dir,
+ [AS_HELP_STRING([--with-nautilus-extension-dir],
+ [specify the nautilus extension directory])])
+
+# Get nautilus extensions directory
+AC_MSG_CHECKING([for nautilus extension directory])
+if test -n "$with_nautilus_extension_dir"; then
+ NAUTILUS_EXTENSION_DIR=$with_nautilus_extension_dir
+else
+ NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
+fi
+if test -z "$NAUTILUS_EXTENSION_DIR"; then
+ NAUTILUS_EXTENSION_DIR='${exec_prefix}/lib/nautilus/extension-1.0'
+fi
+
+AC_MSG_RESULT([${NAUTILUS_EXTENSION_DIR}])
+AC_SUBST(NAUTILUS_EXTENSION_DIR)
+
+NAUTILUS_VERSION=`$PKG_CONFIG --modversion libnautilus-extension`
+if test -n "$NAUTILUS_VERSION"; then
+ NAUTILUS_VERSION_MAJOR=`echo -n $NAUTILUS_VERSION | cut -d . -f 1`
+ NAUTILUS_VERSION_MINOR=`echo -n $NAUTILUS_VERSION | cut -d . -f 2`
+ NAUTILUS_VERSION_MICRO=`echo -n $NAUTILUS_VERSION | cut -d . -f 3`
+fi
+
+AC_DEFINE_UNQUOTED(NAUTILUS_VERSION_MAJOR, [$NAUTILUS_VERSION_MAJOR], [ nautilus version major])
+AC_DEFINE_UNQUOTED(NAUTILUS_VERSION_MINOR, [$NAUTILUS_VERSION_MINOR], [ nautilus version minor])
+AC_DEFINE_UNQUOTED(NAUTILUS_VERSION_MICRO, [$NAUTILUS_VERSION_MICRO], [ nautilus version micro])
+
+EMBLEM_DIR='${datadir}/nautilus-dropbox/emblems'
+AC_SUBST(EMBLEM_DIR)
+
+AC_CONFIG_FILES([
+ Makefile
+ src/Makefile
+ data/Makefile
+ data/icons/Makefile
+ data/icons/hicolor/Makefile
+ data/icons/hicolor/16x16/Makefile
+ data/icons/hicolor/16x16/apps/Makefile
+ data/icons/hicolor/22x22/Makefile
+ data/icons/hicolor/22x22/apps/Makefile
+ data/icons/hicolor/24x24/Makefile
+ data/icons/hicolor/24x24/apps/Makefile
+ data/icons/hicolor/32x32/Makefile
+ data/icons/hicolor/32x32/apps/Makefile
+ data/icons/hicolor/48x48/Makefile
+ data/icons/hicolor/48x48/apps/Makefile
+ data/icons/hicolor/64x64/Makefile
+ data/icons/hicolor/64x64/apps/Makefile
+ data/icons/hicolor/256x256/Makefile
+ data/icons/hicolor/256x256/apps/Makefile
+ data/emblems/Makefile])
+
+AC_OUTPUT
diff -uprN nautilus-dropbox-1.6.0-orig/configure.in nautilus-dropbox-1.6.0/configure.in
--- nautilus-dropbox-1.6.0-orig/configure.in 2013-01-23 23:20:59.000000000 +0100
+++ nautilus-dropbox-1.6.0/configure.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,132 +0,0 @@
-# Initialization
-
-AC_INIT([nautilus-dropbox],1.6.0)
-
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
-
-AC_PREFIX_DEFAULT(/usr)
-
-AM_CONFIG_HEADER(config.h)
-
-# not ready for i18n yet
-#AC_PROG_INTLTOOL([0.29])
-
-# Dependency checks
-NAUTILUS_REQUIRED=2.16.0
-GLIB_REQUIRED=2.14.0
-
-# Used programs
-AC_PROG_CC
-AM_PROG_LIBTOOL
-
-# Check for pkg-config
-AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test "x$HAVE_PKGCONFIG" = "xno"; then
- AC_MSG_ERROR(you need to have pkgconfig installed !)
-fi
-
-PKG_CHECK_MODULES(NAUTILUS, libnautilus-extension >= $NAUTILUS_REQUIRED)
-PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
-
-AC_PATH_PROG([PYTHON], [python])
-
-AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
-AC_SUBST(RST2MAN)
-
-# define module checking macro
-AC_DEFUN([PYTHON_CHECK_MODULE], [
-AC_MSG_CHECKING([for $1])
-
-cat <<EOF | python
-try:
- import $2
-except:
- exit(1)
-else:
- exit(0)
-EOF
-
-if test $? -ne 0; then
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([couldn't find $1])
-else
- AC_MSG_RESULT([yes])
-fi
-])
-
-PYTHON_CHECK_MODULE(pygtk, gtk)
-PYTHON_CHECK_MODULE(gobject, gobject)
-PYTHON_CHECK_MODULE(docutils, docutils)
-
-# Make dependency CFLAGS and LIBS available
-AC_SUBST(NAUTILUS_CFLAGS)
-AC_SUBST(NAUTILUS_LIBS)
-AC_SUBST(GLIB_CFLAGS)
-AC_SUBST(GLIB_LIBS)
-
-# lol stolen from the automake manual
-AC_ARG_ENABLE([debug],
-[ --enable-debug Turn on debugging],
-[case "${enableval}" in
-yes) debug=true ;;
-no) debug=false ;;
-*) AC_MSG_ERROR([bad value ${enableval} for --enable-debug]) ;;
-esac],[debug=false])
-AM_CONDITIONAL([DEBUG], [test x$debug = xtrue])
-
-AC_ARG_WITH(nautilus-extension-dir,
- [AS_HELP_STRING([--with-nautilus-extension-dir],
- [specify the nautilus extension directory])])
-
-# Get nautilus extensions directory
-AC_MSG_CHECKING([for nautilus extension directory])
-if test -n "$with_nautilus_extension_dir"; then
- NAUTILUS_EXTENSION_DIR=$with_nautilus_extension_dir
-else
- NAUTILUS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir libnautilus-extension`
-fi
-if test -z "$NAUTILUS_EXTENSION_DIR"; then
- NAUTILUS_EXTENSION_DIR='${exec_prefix}/lib/nautilus/extension-1.0'
-fi
-
-AC_MSG_RESULT([${NAUTILUS_EXTENSION_DIR}])
-AC_SUBST(NAUTILUS_EXTENSION_DIR)
-
-NAUTILUS_VERSION=`$PKG_CONFIG --modversion libnautilus-extension`
-if test -n "$NAUTILUS_VERSION"; then
- NAUTILUS_VERSION_MAJOR=`echo -n $NAUTILUS_VERSION | cut -d . -f 1`
- NAUTILUS_VERSION_MINOR=`echo -n $NAUTILUS_VERSION | cut -d . -f 2`
- NAUTILUS_VERSION_MICRO=`echo -n $NAUTILUS_VERSION | cut -d . -f 3`
-fi
-
-AC_DEFINE_UNQUOTED(NAUTILUS_VERSION_MAJOR, [$NAUTILUS_VERSION_MAJOR], [ nautilus version major])
-AC_DEFINE_UNQUOTED(NAUTILUS_VERSION_MINOR, [$NAUTILUS_VERSION_MINOR], [ nautilus version minor])
-AC_DEFINE_UNQUOTED(NAUTILUS_VERSION_MICRO, [$NAUTILUS_VERSION_MICRO], [ nautilus version micro])
-
-EMBLEM_DIR='${datadir}/nautilus-dropbox/emblems'
-AC_SUBST(EMBLEM_DIR)
-
-AC_CONFIG_FILES([
- Makefile
- src/Makefile
- data/Makefile
- data/icons/Makefile
- data/icons/hicolor/Makefile
- data/icons/hicolor/16x16/Makefile
- data/icons/hicolor/16x16/apps/Makefile
- data/icons/hicolor/22x22/Makefile
- data/icons/hicolor/22x22/apps/Makefile
- data/icons/hicolor/24x24/Makefile
- data/icons/hicolor/24x24/apps/Makefile
- data/icons/hicolor/32x32/Makefile
- data/icons/hicolor/32x32/apps/Makefile
- data/icons/hicolor/48x48/Makefile
- data/icons/hicolor/48x48/apps/Makefile
- data/icons/hicolor/64x64/Makefile
- data/icons/hicolor/64x64/apps/Makefile
- data/icons/hicolor/256x256/Makefile
- data/icons/hicolor/256x256/apps/Makefile
- data/emblems/Makefile])
-
-AC_OUTPUT
diff -uprN nautilus-dropbox-1.6.0-orig/src/Makefile.am nautilus-dropbox-1.6.0/src/Makefile.am
--- nautilus-dropbox-1.6.0-orig/src/Makefile.am 2010-06-15 01:36:52.000000000 +0200
+++ nautilus-dropbox-1.6.0/src/Makefile.am 2013-05-16 13:52:41.359875041 +0200
@@ -1,4 +1,4 @@
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_builddir)
caja-dropbox_nautilus_to_caja.patch:
Makefile.in | 6
README | 12
config.h.in | 12
configure | 140 ++--
configure.ac | 54 -
data/Makefile.in | 6
data/emblems/Makefile.in | 6
data/icons/Makefile.in | 6
data/icons/hicolor/16x16/Makefile.in | 6
data/icons/hicolor/16x16/apps/Makefile.in | 6
data/icons/hicolor/22x22/Makefile.in | 6
data/icons/hicolor/22x22/apps/Makefile.in | 6
data/icons/hicolor/24x24/Makefile.in | 6
data/icons/hicolor/24x24/apps/Makefile.in | 6
data/icons/hicolor/256x256/Makefile.in | 6
data/icons/hicolor/256x256/apps/Makefile.in | 6
data/icons/hicolor/32x32/Makefile.in | 6
data/icons/hicolor/32x32/apps/Makefile.in | 6
data/icons/hicolor/48x48/Makefile.in | 6
data/icons/hicolor/48x48/apps/Makefile.in | 6
data/icons/hicolor/64x64/Makefile.in | 6
data/icons/hicolor/64x64/apps/Makefile.in | 6
data/icons/hicolor/Makefile.in | 6
dropbox.in | 8
src/Makefile.am | 26
src/Makefile.in | 174 ++---
src/async-io-coroutine.h | 8
src/caja-dropbox-hooks.c | 337 +++++++++
src/caja-dropbox-hooks.h | 79 ++
src/caja-dropbox.c | 960 ++++++++++++++++++++++++++++
src/caja-dropbox.h | 69 ++
src/dropbox-client-util.c | 8
src/dropbox-client-util.h | 8
src/dropbox-client.c | 24
src/dropbox-client.h | 12
src/dropbox-command-client.c | 28
src/dropbox-command-client.h | 28
src/dropbox.c | 28
src/g-util.h | 8
src/nautilus-dropbox-hooks.c | 337 ---------
src/nautilus-dropbox-hooks.h | 79 --
src/nautilus-dropbox.c | 960 ----------------------------
src/nautilus-dropbox.h | 69 --
43 files changed, 1791 insertions(+), 1791 deletions(-)
--- NEW FILE caja-dropbox_nautilus_to_caja.patch ---
diff -uprN nautilus-dropbox-1.6.0-orig/config.h.in nautilus-dropbox-1.6.0/config.h.in
--- nautilus-dropbox-1.6.0-orig/config.h.in 2013-01-31 22:28:21.000000000 +0100
+++ nautilus-dropbox-1.6.0/config.h.in 2013-05-11 23:24:28.235980718 +0200
@@ -34,14 +34,14 @@
*/
#undef LT_OBJDIR
-/* nautilus version major */
-#undef NAUTILUS_VERSION_MAJOR
+/* caja version major */
+#undef CAJA_VERSION_MAJOR
-/* nautilus version micro */
-#undef NAUTILUS_VERSION_MICRO
+/* caja version micro */
+#undef CAJA_VERSION_MICRO
-/* nautilus version minor */
-#undef NAUTILUS_VERSION_MINOR
+/* caja version minor */
+#undef CAJA_VERSION_MINOR
/* Name of package */
#undef PACKAGE
diff -uprN nautilus-dropbox-1.6.0-orig/configure nautilus-dropbox-1.6.0/configure
--- nautilus-dropbox-1.6.0-orig/configure 2013-01-31 22:28:21.000000000 +0100
+++ nautilus-dropbox-1.6.0/configure 2013-05-12 00:24:54.059414771 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for nautilus-dropbox 1.6.0.
+# Generated by GNU Autoconf 2.64 for caja-dropbox 1.6.0.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
@@ -693,10 +693,10 @@ MFLAGS=
MAKEFLAGS=
# Identity of this package.
-PACKAGE_NAME='nautilus-dropbox'
-PACKAGE_TARNAME='nautilus-dropbox'
+PACKAGE_NAME='caja-dropbox'
+PACKAGE_TARNAME='caja-dropbox'
PACKAGE_VERSION='1.6.0'
-PACKAGE_STRING='nautilus-dropbox 1.6.0'
+PACKAGE_STRING='caja-dropbox 1.6.0'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -742,15 +742,15 @@ am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
EMBLEM_DIR
-NAUTILUS_EXTENSION_DIR
+CAJA_EXTENSION_DIR
DEBUG_FALSE
DEBUG_TRUE
RST2MAN
PYTHON
GLIB_LIBS
GLIB_CFLAGS
-NAUTILUS_LIBS
-NAUTILUS_CFLAGS
+CAJA_LIBS
+CAJA_CFLAGS
PKG_CONFIG
HAVE_PKGCONFIG
CPP
@@ -869,7 +869,7 @@ enable_fast_install
with_gnu_ld
enable_libtool_lock
enable_debug
-with_nautilus_extension_dir
+with_caja_extension_dir
'
ac_precious_vars='build_alias
host_alias
@@ -881,8 +881,8 @@ LIBS
CPPFLAGS
CPP
PKG_CONFIG
-NAUTILUS_CFLAGS
-NAUTILUS_LIBS
+CAJA_CFLAGS
+CAJA_LIBS
GLIB_CFLAGS
GLIB_LIBS'
@@ -1426,7 +1426,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures nautilus-dropbox 1.6.0 to adapt to many kinds of systems.
+\`configure' configures caja-dropbox 1.6.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1475,7 +1475,7 @@ Fine tuning of the installation director
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root
- [DATAROOTDIR/doc/nautilus-dropbox]
+ [DATAROOTDIR/doc/caja-dropbox]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
@@ -1497,7 +1497,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of nautilus-dropbox 1.6.0:";;
+ short | recursive ) echo "Configuration of caja-dropbox 1.6.0:";;
esac
cat <<\_ACEOF
@@ -1520,8 +1520,8 @@ Optional Packages:
--with-pic try to use only PIC/non-PIC objects [default=use
both]
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
- --with-nautilus-extension-dir
- specify the nautilus extension directory
+ --with-caja-extension-dir
+ specify the caja extension directory
Some influential environment variables:
CC C compiler command
@@ -1533,10 +1533,10 @@ Some influential environment variables:
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PKG_CONFIG path to pkg-config utility
- NAUTILUS_CFLAGS
- C compiler flags for NAUTILUS, overriding pkg-config
- NAUTILUS_LIBS
- linker flags for NAUTILUS, overriding pkg-config
+ CAJA_CFLAGS
+ C compiler flags for CAJA, overriding pkg-config
+ CAJA_LIBS
+ linker flags for CAJA, overriding pkg-config
GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config
GLIB_LIBS linker flags for GLIB, overriding pkg-config
@@ -1606,7 +1606,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-nautilus-dropbox configure 1.6.0
+caja-dropbox configure 1.6.0
generated by GNU Autoconf 2.64
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -1884,7 +1884,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by nautilus-dropbox $as_me 1.6.0, which was
+It was created by caja-dropbox $as_me 1.6.0, which was
generated by GNU Autoconf 2.64. Invocation command line was
$ $0 $@
@@ -2692,7 +2692,7 @@ fi
# Define the identity of the package.
- PACKAGE=nautilus-dropbox
+ PACKAGE=caja-dropbox
VERSION=1.6.0
@@ -2743,7 +2743,7 @@ ac_config_headers="$ac_config_headers co
#AC_PROG_INTLTOOL([0.29])
# Dependency checks
-NAUTILUS_REQUIRED=2.16.0
+CAJA_REQUIRED=1.2.0
GLIB_REQUIRED=2.14.0
# Used programs
@@ -10529,20 +10529,20 @@ $as_echo "no" >&6; }
fi
pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for NAUTILUS" >&5
-$as_echo_n "checking for NAUTILUS... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CAJA" >&5
+$as_echo_n "checking for CAJA... " >&6; }
if test -n "$PKG_CONFIG"; then
- if test -n "$NAUTILUS_CFLAGS"; then
- pkg_cv_NAUTILUS_CFLAGS="$NAUTILUS_CFLAGS"
+ if test -n "$CAJA_CFLAGS"; then
+ pkg_cv_CAJA_CFLAGS="$CAJA_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnautilus-extension >= \$NAUTILUS_REQUIRED\""; } >&5
- ($PKG_CONFIG --exists --print-errors "libnautilus-extension >= $NAUTILUS_REQUIRED") 2>&5
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcaja-extension >= \$CAJA_REQUIRED\""; } >&5
+ ($PKG_CONFIG --exists --print-errors "libcaja-extension >= $CAJA_REQUIRED") 2>&5
ac_status=$?
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
[...4238 lines suppressed...]
-
- /*debug("create channel"); */
-
- /* Set non-blocking ;) (again just in case) */
- {
- GIOFlags flags;
- GIOStatus iostat;
-
- flags = g_io_channel_get_flags(hookserv->chan);
- iostat = g_io_channel_set_flags(hookserv->chan, flags | G_IO_FLAG_NONBLOCK,
- NULL);
- if (iostat == G_IO_STATUS_ERROR) {
- g_io_channel_unref(hookserv->chan);
- g_timeout_add_seconds(1, (GSourceFunc) try_to_connect, hookserv);
- return FALSE;
- }
- }
-
- /*debug("set non blocking"); */
-
- /* this is fun, async io watcher */
- hookserv->hhsi.line = 0;
- hookserv->hhsi.command_args = NULL;
- hookserv->hhsi.command_name = NULL;
- hookserv->event_source =
- g_io_add_watch_full(hookserv->chan, G_PRIORITY_DEFAULT,
- G_IO_IN | G_IO_PRI | G_IO_ERR | G_IO_HUP | G_IO_NVAL,
- (GIOFunc) handle_hook_server_input, hookserv,
- (GDestroyNotify) watch_killer);
-
- debug("hook client connected");
- hookserv->connected = TRUE;
- g_hook_list_invoke(&(hookserv->onconnect_hooklist), FALSE);
-
- /*debug("added watch");*/
- return FALSE;
-}
-
-/* should only be called in glib main loop */
-/* returns a gboolean because it is a GSourceFunc */
-gboolean nautilus_dropbox_hooks_force_reconnect(NautilusDropboxHookserv *hookserv) {
- debug_enter();
-
- if (hookserv->connected == FALSE) {
- return FALSE;
- }
-
- debug("forcing hook to reconnect");
-
- g_assert(hookserv->event_source >= 0);
-
- if (hookserv->event_source > 0) {
- g_source_remove(hookserv->event_source);
- }
- else if (hookserv->event_source == 0) {
- debug("event source was zero!!!!!");
- }
-
- return FALSE;
-}
-
-gboolean
-nautilus_dropbox_hooks_is_connected(NautilusDropboxHookserv *hookserv) {
- return hookserv->connected;
-}
-
-void
-nautilus_dropbox_hooks_setup(NautilusDropboxHookserv *hookserv) {
- hookserv->dispatch_table = g_hash_table_new_full((GHashFunc) g_str_hash,
- (GEqualFunc) g_str_equal,
- g_free, g_free);
- hookserv->connected = FALSE;
-
- g_hook_list_init(&(hookserv->ondisconnect_hooklist), sizeof(GHook));
- g_hook_list_init(&(hookserv->onconnect_hooklist), sizeof(GHook));
-}
-
-void
-nautilus_dropbox_hooks_add_on_disconnect_hook(NautilusDropboxHookserv *hookserv,
- DropboxHookClientConnectHook dhcch,
- gpointer ud) {
- GHook *newhook;
-
- newhook = g_hook_alloc(&(hookserv->ondisconnect_hooklist));
- newhook->func = dhcch;
- newhook->data = ud;
-
- g_hook_append(&(hookserv->ondisconnect_hooklist), newhook);
-}
-
-void
-nautilus_dropbox_hooks_add_on_connect_hook(NautilusDropboxHookserv *hookserv,
- DropboxHookClientConnectHook dhcch,
- gpointer ud) {
- GHook *newhook;
-
- newhook = g_hook_alloc(&(hookserv->onconnect_hooklist));
- newhook->func = dhcch;
- newhook->data = ud;
-
- g_hook_append(&(hookserv->onconnect_hooklist), newhook);
-}
-
-void nautilus_dropbox_hooks_add(NautilusDropboxHookserv *ndhs,
- const gchar *hook_name,
- DropboxUpdateHook hook, gpointer ud) {
- HookData *hd;
- hd = g_new(HookData, 1);
- hd->hook = hook;
- hd->ud = ud;
- g_hash_table_insert(ndhs->dispatch_table, g_strdup(hook_name), hd);
-}
-
-void
-nautilus_dropbox_hooks_start(NautilusDropboxHookserv *hookserv) {
- try_to_connect(hookserv);
-}
diff -uprN nautilus-dropbox-1.6.0-orig/src/nautilus-dropbox-hooks.h nautilus-dropbox-1.6.0/src/nautilus-dropbox-hooks.h
--- nautilus-dropbox-1.6.0-orig/src/nautilus-dropbox-hooks.h 2010-04-09 01:21:32.000000000 +0200
+++ nautilus-dropbox-1.6.0/src/nautilus-dropbox-hooks.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,79 +0,0 @@
-/*
- * Copyright 2008 Evenflow, Inc.
- *
- * nautilus-dropbox-hooks.h
- * Header file for nautilus-dropbox-hooks.c
- *
- * This file is part of nautilus-dropbox.
- *
- * nautilus-dropbox is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * nautilus-dropbox is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with nautilus-dropbox. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef NAUTILUS_DROPBOX_HOOKS_H
-#define NAUTILUS_DROPBOX_HOOKS_H
-
-#include <glib.h>
-
-G_BEGIN_DECLS
-
-typedef void (*DropboxUpdateHook)(GHashTable *, gpointer);
-typedef void (*DropboxHookClientConnectHook)(gpointer);
-
-typedef struct {
- GIOChannel *chan;
- int socket;
- struct {
- int line;
- gchar *command_name;
- GHashTable *command_args;
- int numargs;
- } hhsi;
- gboolean connected;
- guint event_source;
- GHashTable *dispatch_table;
- GHookList ondisconnect_hooklist;
- GHookList onconnect_hooklist;
-} NautilusDropboxHookserv;
-
-void
-nautilus_dropbox_hooks_setup(NautilusDropboxHookserv *);
-
-void
-nautilus_dropbox_hooks_start(NautilusDropboxHookserv *);
-
-gboolean
-nautilus_dropbox_hooks_is_connected(NautilusDropboxHookserv *);
-
-gboolean
-nautilus_dropbox_hooks_force_reconnect(NautilusDropboxHookserv *);
-
-void
-nautilus_dropbox_hooks_add(NautilusDropboxHookserv *ndhs,
- const gchar *hook_name,
- DropboxUpdateHook hook, gpointer ud);
-void
-nautilus_dropbox_hooks_add_on_disconnect_hook(NautilusDropboxHookserv *hookserv,
- DropboxHookClientConnectHook dhcch,
- gpointer ud);
-
-void
-nautilus_dropbox_hooks_add_on_connect_hook(NautilusDropboxHookserv *hookserv,
- DropboxHookClientConnectHook dhcch,
- gpointer ud);
-
-
-G_END_DECLS
-
-#endif
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/caja-dropbox/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 20 Jul 2013 20:16:40 -0000 1.1
+++ .cvsignore 20 Jul 2013 21:34:10 -0000 1.2
@@ -0,0 +1 @@
+nautilus-dropbox-1.6.0.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/caja-dropbox/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 20 Jul 2013 20:16:40 -0000 1.1
+++ sources 20 Jul 2013 21:34:11 -0000 1.2
@@ -0,0 +1 @@
+ab4ca49eb24498d14edad2c29aac530b nautilus-dropbox-1.6.0.tar.bz2
10 years, 9 months
rpms/caja-dropbox/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/caja-dropbox/devel
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/nonfree/owners/tmpcvsM15221/rpms/caja-dropbox/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module caja-dropbox
***** Error reading new file: [Errno 2] No such file or directory: '.cvsignore'
***** Error reading new file: [Errno 2] No such file or directory: 'Makefile'
***** Error reading new file: [Errno 2] No such file or directory: 'sources'
10 years, 9 months
rpms/caja-dropbox/devel - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/caja-dropbox/devel
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/nonfree/owners/tmpcvsM15221/rpms/caja-dropbox/devel
Log Message:
Directory /cvs/nonfree/rpms/caja-dropbox/devel added to the repository
10 years, 9 months
rpms/caja-dropbox Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/caja-dropbox
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/nonfree/owners/tmpcvsM15221/rpms/caja-dropbox
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module caja-dropbox
--- NEW FILE Makefile ---
# Top level Makefile for module caja-dropbox
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
10 years, 9 months
rpms/caja-dropbox - New directory
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/caja-dropbox
In directory old02.ovh.rpmfusion.lan:/home/rpmfusion/kwizart/nonfree/owners/tmpcvsM15221/rpms/caja-dropbox
Log Message:
Directory /cvs/nonfree/rpms/caja-dropbox added to the repository
10 years, 9 months
rpms/vlc/devel vlc.spec,1.181,1.182
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7971
Modified Files:
vlc.spec
Log Message:
Add missing BR
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- vlc.spec 20 Jul 2013 09:58:45 -0000 1.181
+++ vlc.spec 20 Jul 2013 17:54:35 -0000 1.182
@@ -78,6 +78,7 @@
%{?_with_libdvbpsi:BuildRequires: libdvbpsi-devel}
BuildRequires: libdvdnav-devel
BuildRequires: libebml-devel
+BuildRequires: libgcrypt-devel
BuildRequires: libid3tag-devel
BuildRequires: libkate-devel
%{?_with_libmad:BuildRequires: libmad-devel}
10 years, 9 months
rpms/mythtv/devel mythtv.spec,1.124,1.125
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/mythtv/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8386
Modified Files:
mythtv.spec
Log Message:
Refix
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- mythtv.spec 20 Jul 2013 10:16:31 -0000 1.124
+++ mythtv.spec 20 Jul 2013 10:18:42 -0000 1.125
@@ -80,7 +80,7 @@
%if "%{branch}" == "master"
Release: 0.2.git.%{_gitrev}%{?dist}
%else
-Release: 10%?{dist}
+Release: 10%{?dist}
%endif
# The primary license is GPLv2+, but bits are borrowed from a number of
10 years, 9 months