rpms/paintdotnet/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/paintdotnet/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/nonfree/owners/tmpcvsk13859/rpms/paintdotnet/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module paintdotnet
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: paintdotnet
# $Id: Makefile,v 1.1 2009/06/30 19:09:57 thl Exp $
NAME := paintdotnet
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
15 years, 6 months
rpms/paintdotnet Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/paintdotnet
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/nonfree/owners/tmpcvsk13859/rpms/paintdotnet
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module paintdotnet
--- NEW FILE Makefile ---
# Top level Makefile for module paintdotnet
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 ---
15 years, 6 months
rpms/paintdotnet/devel - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/paintdotnet/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/nonfree/owners/tmpcvsk13859/rpms/paintdotnet/devel
Log Message:
Directory /cvs/nonfree/rpms/paintdotnet/devel added to the repository
15 years, 6 months
rpms/paintdotnet - New directory
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/paintdotnet
In directory se02.es.rpmfusion.net:/home/rpmfusion/thl/nonfree/owners/tmpcvsk13859/rpms/paintdotnet
Log Message:
Directory /cvs/nonfree/rpms/paintdotnet added to the repository
15 years, 6 months
rpms/open-vm-tools/devel open-vm-tools.spec,1.9,1.10
by Denis Leroy
Author: denis
Update of /cvs/free/rpms/open-vm-tools/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15102
Modified Files:
open-vm-tools.spec
Log Message:
Removed procps support until 3.2.8 is investigated
Index: open-vm-tools.spec
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools/devel/open-vm-tools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- open-vm-tools.spec 30 Jun 2009 10:46:21 -0000 1.9
+++ open-vm-tools.spec 30 Jun 2009 11:08:42 -0000 1.10
@@ -23,7 +23,6 @@
BuildRequires: libXtst-devel
BuildRequires: libdnet-devel
BuildRequires: pam-devel
-BuildRequires: procps
BuildRequires: libdnet-devel
BuildRequires: libicu-devel
BuildRequires: desktop-file-utils
@@ -83,6 +82,7 @@
--disable-dependency-tracking \
--without-kernel-modules \
--without-root-privileges \
+ --without-procps \
--with-gtkmm
# Disable use of rpath
@@ -191,6 +191,7 @@
- Added pam-devel BR
- Switch to vmtoolsd for vmsvc, updated init file
- Added patch to fix default vmtoolsd plugin path
+- Removed procps support until 3.2.8 is investigated
* Fri Apr 3 2009 Denis Leroy <denis(a)poolshark.org> - 0.0.0.154848-3
- Fixing ExclusiveArch
15 years, 6 months
rpms/open-vm-tools-kmod/devel .cvsignore, 1.6, 1.7 open-vm-tools-kmod.spec, 1.30, 1.31 sources, 1.6, 1.7
by Denis Leroy
Author: denis
Update of /cvs/free/rpms/open-vm-tools-kmod/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13966
Modified Files:
.cvsignore open-vm-tools-kmod.spec sources
Log Message:
- Update to upstream build 172495
- Some build changes to use new common code subdirectory
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools-kmod/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 23 Mar 2009 11:06:37 -0000 1.6
+++ .cvsignore 30 Jun 2009 10:48:46 -0000 1.7
@@ -1 +1 @@
-open-vm-tools-2009.03.18-154848.tar.gz
+open-vm-tools-2009.06.18-172495.tar.gz
Index: open-vm-tools-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools-kmod/devel/open-vm-tools-kmod.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- open-vm-tools-kmod.spec 5 Jun 2009 13:23:12 -0000 1.30
+++ open-vm-tools-kmod.spec 30 Jun 2009 10:48:46 -0000 1.31
@@ -6,13 +6,13 @@
#define buildforkernels newest
%define tname open-vm-tools
-%define builddate 2009.03.18
-%define buildver 154848
+%define builddate 2009.06.18
+%define buildver 172495
%define ovtmodules vmblock vmci vmhgfs vmmemctl vmsync vmxnet vmxnet3 vsock pvscsi
Name: open-vm-tools-kmod
Version: 0.0.0.%{buildver}
-Release: 1%{?dist}.9
+Release: 1%{?dist}
Summary: VMware Tools Kernel Modules
Group: System Environment/Kernel
License: GPLv2
@@ -45,14 +45,16 @@
%setup -q -n open-vm-tools-%{builddate}-%{buildver}
for kernel_version in %{?kernel_versions} ; do
- cp -ar modules/linux _kmod_build_${kernel_version%%___*}
+ mkdir -p _kmod_build_${kernel_version%%___*}/
+ cp -ar modules _kmod_build_${kernel_version%%___*}/
+ cp -ar lib _kmod_build_${kernel_version%%___*}/
done
%build
for kernel_version in %{?kernel_versions} ; do
for ovtmodule in %{ovtmodules}; do
- make -C ${PWD}/_kmod_build_${kernel_version%%___*}/${ovtmodule} VM_UNAME=${kernel_version%%___*} HEADER_DIR="${kernel_version##*___}/include" CC_OPTS=-DVMW_HAVE_EPOLL
+ make -C ${PWD}/_kmod_build_${kernel_version%%___*}/modules/linux/${ovtmodule} VM_UNAME=${kernel_version%%___*} HEADER_DIR="${kernel_version##*___}/include" OVT_SOURCE_DIR=${PWD}/_kmod_build_${kernel_version%%___*} CC_OPTS=-DVMW_HAVE_EPOLL
done
done
@@ -61,7 +63,7 @@
rm -rf $RPM_BUILD_ROOT
for kernel_version in %{?kernel_versions} ; do
for ovtmodule in %{ovtmodules}; do
- install -D -m 755 _kmod_build_${kernel_version%%___*}/${ovtmodule}/${ovtmodule}.ko $RPM_BUILD_ROOT%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/${ovtmodule}.ko
+ install -D -m 755 _kmod_build_${kernel_version%%___*}/modules/linux/${ovtmodule}/${ovtmodule}.ko $RPM_BUILD_ROOT%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/${ovtmodule}.ko
done
done
# akmods:
@@ -73,6 +75,10 @@
%changelog
+* Tue Jun 30 2009 Denis Leroy <denis(a)poolshark.org> - 0.0.0.172495-1
+- Update to upstream build 172495
+- Some build changes to use new common code subdirectory
+
* Fri Jun 05 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.0.0.154848-1.9
- rebuild for final F11 kernel
Index: sources
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools-kmod/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 23 Mar 2009 11:06:37 -0000 1.6
+++ sources 30 Jun 2009 10:48:46 -0000 1.7
@@ -1 +1 @@
-23d577a1bc07fa61bcd5352e94f05ed6 open-vm-tools-2009.03.18-154848.tar.gz
+8bd5304e84465005bb01b5055497cce1 open-vm-tools-2009.06.18-172495.tar.gz
15 years, 6 months
rpms/open-vm-tools/devel open-vm-tools-172495-pluginpath.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 open-vm-tools-guestd.init, 1.1, 1.2 open-vm-tools.spec, 1.8, 1.9 sources, 1.6, 1.7
by Denis Leroy
Author: denis
Update of /cvs/free/rpms/open-vm-tools/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13498
Modified Files:
.cvsignore open-vm-tools-guestd.init open-vm-tools.spec
sources
Added Files:
open-vm-tools-172495-pluginpath.patch
Log Message:
- Update to upstream build 172495
- Split libs subpackage for multilib friendliness
- Added pam-devel BR
- Switch to vmtoolsd for vmsvc, updated init file
- Added patch to fix default vmtoolsd plugin path
open-vm-tools-172495-pluginpath.patch:
--- NEW FILE open-vm-tools-172495-pluginpath.patch ---
--- open-vm-tools-2009.06.18-172495/services/vmtoolsd/Makefile.in~ 2009-06-18 09:03:40.000000000 +0200
+++ open-vm-tools-2009.06.18-172495/services/vmtoolsd/Makefile.in 2009-06-30 12:19:16.985865101 +0200
@@ -278,7 +278,7 @@
pamdir = $(PAM_PREFIX)/pam.d
vmtoolsd_CPPFLAGS = @VMTOOLS_CPPFLAGS@ @GMODULE_CPPFLAGS@ \
@GOBJECT_CPPFLAGS@ @GTHREAD_CPPFLAGS@ -I$(builddir) \
- -DVMTOOLSD_PLUGIN_ROOT=\"$(pkglibdir)\"
+ -DVMTOOLSD_PLUGIN_ROOT=\"$(sysconfdir)/vmware-tools/plugins\"
vmtoolsd_LDADD = @VMTOOLS_LIBS@ @GMODULE_LIBS@ @GOBJECT_LIBS@ \
@GTHREAD_LIBS@ $(am__append_1)
vmtoolsd_SOURCES = cmdLine.c mainLoop.c mainPosix.c pluginMgr.c \
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore 23 Mar 2009 10:48:03 -0000 1.6
+++ .cvsignore 30 Jun 2009 10:46:21 -0000 1.7
@@ -1 +1 @@
-open-vm-tools-2009.03.18-154848.tar.gz
+open-vm-tools-2009.06.18-172495.tar.gz
Index: open-vm-tools-guestd.init
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools/devel/open-vm-tools-guestd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- open-vm-tools-guestd.init 10 Nov 2008 20:59:46 -0000 1.1
+++ open-vm-tools-guestd.init 30 Jun 2009 10:46:21 -0000 1.2
@@ -1,23 +1,23 @@
#!/bin/bash
#
-# Init file for open-vm-tools vmware-guestd daemon
+# Init file for open-vm-tools vmtoolsd daemon
#
# chkconfig: 345 80 20
# description: open-vm-tools guest daemon
#
-# processname: vmware-guestd
-# pidfile: /var/run/vmware-guestd.pid
+# processname: vmtoolsd
+# pidfile: /var/run/vmtoolsd.pid
# source function library
. /etc/rc.d/init.d/functions
RETVAL=0
-prog="vmware-guestd"
+prog="vmtoolsd"
-GUESTD=/usr/sbin/vmware-guestd
-PID_FILE=/var/run/vmware-guestd.pid
-LOCK_FILE=/var/lock/subsys/vmware-guestd
-OPTIONS="--background $PID_FILE"
+GUESTD=/usr/bin/vmtoolsd
+PID_FILE=/var/run/vmtoolsd.pid
+LOCK_FILE=/var/lock/subsys/vmtoolsd
+OPTIONS="-b $PID_FILE"
DND_DIR="/tmp/VMwareDnD"
setup_modules()
@@ -42,7 +42,7 @@
start()
{
- echo -n $"Starting $prog: "
+ echo -n $"Starting Open-vm-tools guest daemon: "
setup_modules
$GUESTD $OPTIONS && success || failure
RETVAL=$?
@@ -52,8 +52,8 @@
stop()
{
- echo -n $"Stopping $prog: "
- killall vmware-user
+ echo -n $"Stopping Open-vm-tools guest daemon: "
+ killall vmware-user 2>/dev/null
unmount_stuff
killproc $GUESTD
RETVAL=$?
Index: open-vm-tools.spec
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools/devel/open-vm-tools.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- open-vm-tools.spec 3 Apr 2009 21:57:33 -0000 1.8
+++ open-vm-tools.spec 30 Jun 2009 10:46:21 -0000 1.9
@@ -1,9 +1,9 @@
-%define builddate 2009.03.18
-%define buildver 154848
+%define builddate 2009.06.18
+%define buildver 172495
Name: open-vm-tools
Version: 0.0.0.%{buildver}
-Release: 3%{?dist}
+Release: 1%{?dist}
Summary: VMware Guest OS Tools
Group: Applications/System
License: LGPLv2
@@ -13,6 +13,7 @@
Source2: %{name}-sysconfig.mouse
Source3: vmware-toolbox.desktop
Source4: %{name}-modprobe.vmnics
+Patch0: open-vm-tools-172495-pluginpath.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
ExclusiveArch: i586 x86_64
@@ -21,6 +22,7 @@
BuildRequires: gtkmm24-devel
BuildRequires: libXtst-devel
BuildRequires: libdnet-devel
+BuildRequires: pam-devel
BuildRequires: procps
BuildRequires: libdnet-devel
BuildRequires: libicu-devel
@@ -28,6 +30,7 @@
BuildRequires: uriparser-devel
BuildRequires: libnotify-devel
BuildRequires: libXScrnSaver-devel
+BuildRequires: doxygen graphviz
Requires: open-vm-tools-kmod >= %{version}
Obsoletes: open-vm-tools-kmod < %{version}
@@ -41,11 +44,22 @@
machines. This package contains the user-space programs and libraries
of open-vm-tools.
+%package libs
+Summary: Libraries for %{name}
+Group: System Environment/Libraries
+
+
+%description libs
+The %{name}-libs package contains the runtime shared libraries for
+%{name}.
+
+
%package devel
Summary: Development package for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+
%description devel
Open-vm-tools are the open source implementation of VMware Tools. They
are a set of guest operating system virtualization components that
@@ -56,6 +70,7 @@
%prep
%setup -q -n open-vm-tools-%{builddate}-%{buildver}
+%patch0 -p1 -b .pluginpath
# Fix some permissions and formats
chmod -x NEWS README ChangeLog AUTHORS COPYING
sed -i 's/\r//' README
@@ -64,6 +79,7 @@
%build
%configure \
--disable-static \
+ --enable-docs \
--disable-dependency-tracking \
--without-kernel-modules \
--without-root-privileges \
@@ -81,9 +97,9 @@
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
-# Install vmware-guestd init script
+# Install vmtoolsd init script
mkdir -p $RPM_BUILD_ROOT/etc/init.d/
-install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/vmware-guestd
+install -m 0755 %{SOURCE1} $RPM_BUILD_ROOT/etc/init.d/vmtoolsd
# GPM vmmouse support
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
@@ -95,7 +111,7 @@
# Install VMCI sockets header file
mkdir -p $RPM_BUILD_ROOT%{_includedir}
-install -m 0644 modules/linux/vsock/linux/vmci_sockets.h $RPM_BUILD_ROOT%{_includedir}
+install -m 0644 lib/include/vmci_sockets.h $RPM_BUILD_ROOT%{_includedir}
# Move vmware-user desktop into autostart directory
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart
@@ -108,7 +124,10 @@
# Setup module-init-tools file for vmxnet
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d
-install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/vmnics
+install -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/vmnics.conf
+
+# Set suid bit on vmware-user suid wrapper
+chmod +s $RPM_BUILD_ROOT%{_bindir}/vmware-user-suid-wrapper
%clean
@@ -118,7 +137,7 @@
%post
# Setup guestd on initial install
/sbin/ldconfig
-[ $1 -lt 2 ] && /sbin/chkconfig vmware-guestd on ||:
+[ $1 -lt 2 ] && /sbin/chkconfig vmtoolsd on ||:
update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
@@ -131,28 +150,32 @@
# Remove on uninstall
if [ "$1" = 0 ]
then
- /sbin/service vmware-guestd stop > /dev/null 2>&1 || :
- /sbin/chkconfig --del vmware-guestd ||:
+ /sbin/service vmtoolsd stop > /dev/null 2>&1 || :
+ /sbin/chkconfig --del vmtoolsd ||:
fi
%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
+%doc %{_docdir}/open-vm-tools
%{_bindir}/vm*
-%{_sbindir}/vmware*
%{_datadir}/applications/*.desktop
%{_sysconfdir}/xdg/autostart/*.desktop
%{_datadir}/pixmaps/*.xpm
-%{_libdir}/*.so.*
-%{_libdir}/open-vm-tools
+%{_datadir}/open-vm-tools
%{_sysconfdir}/init.d/*
%{_sysconfdir}/vmware-tools
%config(noreplace) %{_sysconfdir}/pam.d/*
%config(noreplace) %{_sysconfdir}/sysconfig/mouse
%config(noreplace) %{_sysconfdir}/modprobe.d/*
%attr(4755,root,root) /sbin/mount.vmhgfs
-%attr(4755,root,root) %{_bindir}/vmware-user-suid-wrapper
+
+
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/*.so.*
+%{_libdir}/open-vm-tools
%files devel
@@ -162,6 +185,13 @@
%changelog
+* Tue Jun 30 2009 Denis Leroy <denis(a)poolshark.org> - 0.0.0.172495-1
+- Update to upstream build 172495
+- Split libs subpackage for multilib friendliness
+- Added pam-devel BR
+- Switch to vmtoolsd for vmsvc, updated init file
+- Added patch to fix default vmtoolsd plugin path
+
* Fri Apr 3 2009 Denis Leroy <denis(a)poolshark.org> - 0.0.0.154848-3
- Fixing ExclusiveArch
Index: sources
===================================================================
RCS file: /cvs/free/rpms/open-vm-tools/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources 23 Mar 2009 10:48:04 -0000 1.6
+++ sources 30 Jun 2009 10:46:21 -0000 1.7
@@ -1 +1 @@
-23d577a1bc07fa61bcd5352e94f05ed6 open-vm-tools-2009.03.18-154848.tar.gz
+8bd5304e84465005bb01b5055497cce1 open-vm-tools-2009.06.18-172495.tar.gz
15 years, 6 months
rpms/VirtualBox-OSE/F-11 .cvsignore,1.3,1.4 sources,1.3,1.4
by Lubomir Rintel
Author: lkundrak
Update of /cvs/free/rpms/VirtualBox-OSE/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3064
Modified Files:
.cvsignore sources
Log Message:
Merge in the missing files
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 3 May 2009 14:24:14 -0000 1.3
+++ .cvsignore 29 Jun 2009 21:52:06 -0000 1.4
@@ -1,2 +1,2 @@
-VirtualBox-2.2.2-OSE.tar.bz2
+VirtualBox-2.2.4-OSE.tar.bz2
UserManual.pdf
Index: sources
===================================================================
RCS file: /cvs/free/rpms/VirtualBox-OSE/F-11/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 3 May 2009 14:24:14 -0000 1.3
+++ sources 29 Jun 2009 21:52:06 -0000 1.4
@@ -1,2 +1,2 @@
-82a76247b63e1813695175e7ddf01975 VirtualBox-2.2.2-OSE.tar.bz2
-37573de808ddf2f4e7fe5f46966fbbe6 UserManual.pdf
+b90176e3878ccfef2991322b2248dcb0 VirtualBox-2.2.4-OSE.tar.bz2
+1f8ec67c1dbc0bcdfbbfbe26171eb098 UserManual.pdf
15 years, 6 months
rpms/cairo-dock/F-11 .cvsignore, 1.17, 1.18 cairo-dock.spec, 1.24, 1.25 sources, 1.19, 1.20
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12434/F-11
Modified Files:
.cvsignore cairo-dock.spec sources
Log Message:
* Sat Jun 27 2009 Mamoru Tasaka <mtaaska(a)ioa.s.u-tokyo.ac.jp> - 2.0.6-1
- 2.0.6
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 10 Jun 2009 17:35:07 -0000 1.17
+++ .cvsignore 29 Jun 2009 15:01:37 -0000 1.18
@@ -1,2 +1,2 @@
-cairo-dock-2.0.5.tar.bz2
-cairo-dock-plugins-2.0.5.tar.bz2
+cairo-dock-2.0.6.tar.bz2
+cairo-dock-plugins-2.0.6.tar.bz2
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/cairo-dock.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- cairo-dock.spec 10 Jun 2009 17:35:07 -0000 1.24
+++ cairo-dock.spec 29 Jun 2009 15:01:37 -0000 1.25
@@ -11,7 +11,7 @@
# Set the below to 1 when building unstable plug-ins
%global build_other 1
-%global mainver 2.0.5
+%global mainver 2.0.6
%undefine betaver
%global build_themes 0
@@ -200,9 +200,12 @@
%endif
pushd .
+
# A. main
cd cairo-dock
+# Patch
+
# permission
for dir in */
do
@@ -257,13 +260,6 @@
stacks/configure.ac
%endif
-# System-Monitor
-%if 0%{?released} < 1
-%{__sed} -i.typo \
- -e 's|CPUSAGE|SYSTEM_MONITOR|' \
- System-Monitor/po/Makefile.in.in
-%endif
-
# template: upstream says this is not needed
%{__rm} -rf template/
@@ -565,6 +561,9 @@
popd # from $RPM_BUILD_ROOT
+# For now these are not needed
+rm -f %{buildroot}%{_libdir}/libcairo-dock.*
+
%clean
%{__rm} -rf $RPM_BUILD_ROOT
@@ -630,6 +629,22 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Sat Jun 27 2009 Mamoru Tasaka <mtaaska(a)ioa.s.u-tokyo.ac.jp> - 2.0.6-1
+- 2.0.6
+
+* Thu Jun 25 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
+- rev 1833
+- Remove workaround for bug 506656
+
+* Thu Jun 18 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
+- rev 1825
+- Remove debugedit workaround as bug 505774 is solved.
+- Workaround for X11/extensions/XTest.h bug 506656
+
+* Mon Jun 15 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
+- rev 1821
+- Compile with -gdwarf-2 until bug 505774 is resolved.
+
* Thu Jun 11 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.0.5-1
- 2.0.5
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 10 Jun 2009 17:35:07 -0000 1.19
+++ sources 29 Jun 2009 15:01:37 -0000 1.20
@@ -1,2 +1,2 @@
-17863320a80d96bfebf248bd0fc10ce2 cairo-dock-2.0.5.tar.bz2
-1409c80cf5a02fbe28c1dc49c187d1e7 cairo-dock-plugins-2.0.5.tar.bz2
+8d0d213e64824445e7a291eb5f16dd45 cairo-dock-2.0.6.tar.bz2
+5444eab4192f980f9ef93d6bc95b1585 cairo-dock-plugins-2.0.6.tar.bz2
15 years, 6 months
rpms/cairo-dock/devel .cvsignore, 1.24, 1.25 cairo-dock.spec, 1.31, 1.32 sources, 1.26, 1.27
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12434/devel
Modified Files:
.cvsignore cairo-dock.spec sources
Log Message:
* Sat Jun 27 2009 Mamoru Tasaka <mtaaska(a)ioa.s.u-tokyo.ac.jp> - 2.0.6-1
- 2.0.6
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 24 Jun 2009 18:31:51 -0000 1.24
+++ .cvsignore 29 Jun 2009 15:01:37 -0000 1.25
@@ -1 +1,2 @@
-cairo-dock-sources-svn1833_trunk.tar.bz2
+cairo-dock-2.0.6.tar.bz2
+cairo-dock-plugins-2.0.6.tar.bz2
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- cairo-dock.spec 24 Jun 2009 18:31:51 -0000 1.31
+++ cairo-dock.spec 29 Jun 2009 15:01:37 -0000 1.32
@@ -6,13 +6,13 @@
# cd trunk
# tar cjf ../cairo-dock-sources-%%{tag}.tar.bz2 .
-%global released 0
-%define pre_release 1
+%global released 1
+%undefine pre_release
# Set the below to 1 when building unstable plug-ins
%global build_other 1
%global mainver 2.0.6
-%define betaver svn1833_trunk
+%undefine betaver
%global build_themes 0
@@ -54,7 +54,6 @@
# plug-ins specific patches
Patch100: cairo-dock-rev1677-stacks.patch
-#Patch200: xorg-x11-proto-devel-workaround-bz505774.patch
%if ! %{released}
BuildRequires: automake
@@ -202,20 +201,6 @@
pushd .
-%if 0
-####
-# Workaround for bz 506656
-mkdir -p .%{_includedir}/X11/extensions
-pushd .%{_includedir}/X11/extensions
-cp -p %{_includedir}/X11/extensions/XTest.h .
-%patch200 -p4
-popd
-
-%global optflags_ %{optflags}
-%global optflags %{optflags_} -I%{_builddir}/%{name}-%{version}/%{_includedir}
-####
-%endif
-
# A. main
cd cairo-dock
@@ -644,6 +629,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Sat Jun 27 2009 Mamoru Tasaka <mtaaska(a)ioa.s.u-tokyo.ac.jp> - 2.0.6-1
+- 2.0.6
+
* Thu Jun 25 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
- rev 1833
- Remove workaround for bug 506656
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources 24 Jun 2009 18:31:51 -0000 1.26
+++ sources 29 Jun 2009 15:01:37 -0000 1.27
@@ -1 +1,2 @@
-79f3fc36c67b383e7f097e392a5a297d cairo-dock-sources-svn1833_trunk.tar.bz2
+8d0d213e64824445e7a291eb5f16dd45 cairo-dock-2.0.6.tar.bz2
+5444eab4192f980f9ef93d6bc95b1585 cairo-dock-plugins-2.0.6.tar.bz2
15 years, 6 months