rpms/iscsitarget-kmod/F-12 iscsitarget-kmod.spec,1.49,1.50
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/iscsitarget-kmod/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6328
Modified Files:
iscsitarget-kmod.spec
Log Message:
* Thu Feb 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:1.4.18-1.13
- rebuild for new kernel
Index: iscsitarget-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/iscsitarget-kmod/F-12/iscsitarget-kmod.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- iscsitarget-kmod.spec 10 Feb 2010 21:54:17 -0000 1.49
+++ iscsitarget-kmod.spec 11 Feb 2010 19:41:28 -0000 1.50
@@ -7,7 +7,7 @@
Name: iscsitarget-kmod
Version: 1.4.18
-Release: 1%{?dist}.12
+Release: 1%{?dist}.13
Epoch: 1
Summary: iscsitarget kernel modules
@@ -66,6 +66,9 @@
%changelog
+* Thu Feb 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:1.4.18-1.13
+- rebuild for new kernel
+
* Wed Feb 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1:1.4.18-1.12
- rebuild for new kernel
14 years, 9 months
rpms/em8300-kmod/F-12 em8300-kmod.spec,1.54,1.55
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/em8300-kmod/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6192
Modified Files:
em8300-kmod.spec
Log Message:
* Thu Feb 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.17.4-1.10
- rebuild for new kernel
Index: em8300-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/em8300-kmod/F-12/em8300-kmod.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- em8300-kmod.spec 10 Feb 2010 21:54:00 -0000 1.54
+++ em8300-kmod.spec 11 Feb 2010 19:41:15 -0000 1.55
@@ -10,7 +10,7 @@
Name: em8300-kmod
Summary: Kernel modules for DXR3/Hollywood Plus MPEG decoder cards
Version: 0.17.4
-Release: 1%{?dist}.9
+Release: 1%{?dist}.10
Group: System Environment/Kernel
License: GPLv2+
@@ -63,6 +63,9 @@
%changelog
+* Thu Feb 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.17.4-1.10
+- rebuild for new kernel
+
* Wed Feb 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.17.4-1.9
- rebuild for new kernel
14 years, 9 months
rpms/blcr-kmod/F-12 blcr-kmod.spec,1.32,1.33
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/blcr-kmod/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv6057
Modified Files:
blcr-kmod.spec
Log Message:
* Thu Feb 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.8.1-3.23
- rebuild for new kernel
Index: blcr-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/blcr-kmod/F-12/blcr-kmod.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- blcr-kmod.spec 10 Feb 2010 21:53:44 -0000 1.32
+++ blcr-kmod.spec 11 Feb 2010 19:41:02 -0000 1.33
@@ -7,7 +7,7 @@
Name: blcr-kmod
Version: 0.8.1
-Release: 3%{?dist}.22
+Release: 3%{?dist}.23
Summary: Kernel module (kmod) for Berkeley Lab Checkpoint/Restart for Linux
%define distname blcr-%{version}
@@ -83,6 +83,9 @@
rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Feb 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.8.1-3.23
+- rebuild for new kernel
+
* Wed Feb 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.8.1-3.22
- rebuild for new kernel
14 years, 9 months
rpms/mythtv/devel mythtv.spec,1.65,1.66
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4946
Modified Files:
mythtv.spec
Log Message:
* Thu Feb 11 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23535
- Update to svn trunk, revision 23535
- Rename libmyth to mythtv-libs, libmyth-devel to mythtv-devel
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- mythtv.spec 11 Feb 2010 19:31:38 -0000 1.65
+++ mythtv.spec 11 Feb 2010 19:33:49 -0000 1.66
@@ -1481,7 +1481,7 @@
################################################################################
%changelog
-* Fri Feb 05 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23535
+* Thu Feb 11 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23535
- Update to svn trunk, revision 23535
* Fri Feb 05 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23479
14 years, 9 months
rpms/mythtv/devel mythbackend.init.in, 1.1, 1.2 mythtv.spec, 1.64, 1.65 sources, 1.39, 1.40
by Jarod Wilson
Author: jarod
Update of /cvs/free/rpms/mythtv/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv4427
Modified Files:
mythbackend.init.in mythtv.spec sources
Log Message:
* Fri Feb 05 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23535
- Update to svn trunk, revision 23535
- Rename libmyth to mythtv-libs, libmyth-devel to mythtv-devel
Index: mythbackend.init.in
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythbackend.init.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mythbackend.init.in 3 Aug 2008 15:20:03 -0000 1.1
+++ mythbackend.init.in 11 Feb 2010 19:31:38 -0000 1.2
@@ -22,6 +22,8 @@
prog=mythbackend
RETVAL=0
OPTIONS="$OPTIONS --daemon --logfile @logdir(a)/mythtv/$prog.log --pidfile @rundir(a)/$prog.pid"
+# Would be nice to run as non-root, but it doesn't work -- dvb/v4l devices owned by root become unusable
+#OPTIONS="$OPTIONS --daemon --user mythtv --logfile @logdir(a)/mythtv/$prog.log --pidfile @rundir(a)/$prog.pid"
start() {
echo -n $"Starting $prog: "
Index: mythtv.spec
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/mythtv.spec,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- mythtv.spec 3 Feb 2010 16:05:15 -0000 1.64
+++ mythtv.spec 11 Feb 2010 19:31:38 -0000 1.65
@@ -65,7 +65,7 @@
%define desktop_vendor RPMFusion
# SVN Revision number and branch ID
-%define _svnrev r23456
+%define _svnrev r23535
%define branch trunk
#
@@ -291,7 +291,7 @@
################################################################################
# Requirements for the mythtv meta package
-Requires: libmyth = %{version}-%{release}
+Requires: mythtv-libs = %{version}-%{release}
Requires: mythtv-backend = %{version}-%{release}
Requires: mythtv-base-themes = %{version}-%{release}
Requires: mythtv-common = %{version}-%{release}
@@ -347,27 +347,31 @@
################################################################################
-%package -n libmyth
+%package libs
Summary: Library providing mythtv support
Group: System Environment/Libraries
+Provides: libmyth = %{version}-%{release}
+Obsoletes: libmyth < %{version}-%{release}
Requires: freetype >= 2
Requires: lame
Requires: qt4 >= 4.4
Requires: qt4-MySQL
-%description -n libmyth
+%description libs
Common library code for MythTV and add-on modules (development)
MythTV provides a unified graphical interface for recording and viewing
television programs. Refer to the mythtv package for more information.
################################################################################
-%package -n libmyth-devel
-Summary: Development files for libmyth
+%package devel
+Summary: Development files for mythtv
Group: Development/Libraries
+Provides: libmyth-devel = %{version}-%{release}
+Obsoletes: libmyth-devel < %{version}-%{release}
-Requires: libmyth = %{version}-%{release}
+Requires: mythtv-libs = %{version}-%{release}
Requires: freetype-devel >= 2
Requires: mysql-devel >= 5
@@ -436,7 +440,7 @@
Requires: libvdpau-devel
%endif
-%description -n libmyth-devel
+%description devel
This package contains the header files and libraries for developing
add-ons for mythtv.
@@ -996,7 +1000,7 @@
%if %{with_plugins}
cd mythplugins-%{version}
-# Fix things up so they can find our "temp" install location for libmyth
+# Fix things up so they can find our "temp" install location for mythtv-libs
echo "QMAKE_PROJECT_DEPTH = 0" >> settings.pro
find . -name \*.pro \
-exec sed -i -e "s,INCLUDEPATH += .\+/include/mythtv,INCLUDEPATH += $temp%{_includedir}/mythtv," {} \; \
@@ -1194,9 +1198,9 @@
################################################################################
-%post -n libmyth -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
-%postun -n libmyth -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%pre backend
# Add the "mythtv" user, with membership in the video group
@@ -1287,11 +1291,11 @@
%dir %{_datadir}/mythtv/themes
%{_datadir}/mythtv/themes/*
-%files -n libmyth
+%files libs
%defattr(-,root,root,-)
%{_libdir}/*.so.*
-%files -n libmyth-devel
+%files devel
%defattr(-,root,root,-)
%{_includedir}/*
%{_libdir}/*.so
@@ -1477,6 +1481,13 @@
################################################################################
%changelog
+* Fri Feb 05 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23535
+- Update to svn trunk, revision 23535
+
+* Fri Feb 05 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23479
+- Update to svn trunk, revision 23479
+- Rename libmyth to mythtv-libs, libmyth-devel to mythtv-devel
+
* Wed Feb 03 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23456
- Update to svn trunk, revision 23456
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mythtv/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources 3 Feb 2010 16:05:15 -0000 1.39
+++ sources 11 Feb 2010 19:31:38 -0000 1.40
@@ -1,4 +1,4 @@
be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png
be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png
-c35cc1ac184e1ba4e8a84246f6ddd984 mythtv-0.23.tar.bz2
-6f8c27aa7f0657608011ffbac02ea524 mythplugins-0.23.tar.bz2
+c73d72dee617e9b4351a04224106c353 mythplugins-0.23.tar.bz2
+b86711e8e2022dc9c3e554a1f6ec52f9 mythtv-0.23.tar.bz2
14 years, 9 months
rpms/buildsys-build-rpmfusion/F-12 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.28, 1.29 buildsys-build-rpmfusion.spec, 1.36, 1.37
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23394
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Thu Feb 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:12-10
- rebuild for kernel 2.6.31.12-174.2.19.fc12
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-12/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- buildsys-build-rpmfusion-kerneldevpkgs-current 10 Feb 2010 21:39:10 -0000 1.28
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 11 Feb 2010 17:57:25 -0000 1.29
@@ -1,3 +1,3 @@
-2.6.31.12-174.2.17.fc12
-2.6.31.12-174.2.17.fc12smp
-2.6.31.12-174.2.17.fc12PAE
+2.6.31.12-174.2.19.fc12
+2.6.31.12-174.2.19.fc12smp
+2.6.31.12-174.2.19.fc12PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-12/buildsys-build-rpmfusion.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- buildsys-build-rpmfusion.spec 10 Feb 2010 21:39:10 -0000 1.36
+++ buildsys-build-rpmfusion.spec 11 Feb 2010 17:57:25 -0000 1.37
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 12
-Release: 9
+Release: 10
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -90,6 +90,9 @@
%changelog
+* Thu Feb 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:12-10
+- rebuild for kernel 2.6.31.12-174.2.19.fc12
+
* Wed Feb 10 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:12-9
- rebuild for kernel 2.6.31.12-174.2.17.fc12
14 years, 9 months
rpms/buildsys-build-rpmfusion/F-11 buildsys-build-rpmfusion-kerneldevpkgs-current, 1.35, 1.36 buildsys-build-rpmfusion.spec, 1.43, 1.44
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/buildsys-build-rpmfusion/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23230
Modified Files:
buildsys-build-rpmfusion-kerneldevpkgs-current
buildsys-build-rpmfusion.spec
Log Message:
* Thu Feb 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:11-0.33
- rebuild for kernel 2.6.30.10-105.2.23.fc11
Index: buildsys-build-rpmfusion-kerneldevpkgs-current
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-11/buildsys-build-rpmfusion-kerneldevpkgs-current,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- buildsys-build-rpmfusion-kerneldevpkgs-current 8 Feb 2010 06:45:42 -0000 1.35
+++ buildsys-build-rpmfusion-kerneldevpkgs-current 11 Feb 2010 17:56:54 -0000 1.36
@@ -1,3 +1,3 @@
-2.6.30.10-105.2.16.fc11
-2.6.30.10-105.2.16.fc11smp
-2.6.30.10-105.2.16.fc11PAE
+2.6.30.10-105.2.23.fc11
+2.6.30.10-105.2.23.fc11smp
+2.6.30.10-105.2.23.fc11PAE
Index: buildsys-build-rpmfusion.spec
===================================================================
RCS file: /cvs/free/rpms/buildsys-build-rpmfusion/F-11/buildsys-build-rpmfusion.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- buildsys-build-rpmfusion.spec 8 Feb 2010 06:45:42 -0000 1.43
+++ buildsys-build-rpmfusion.spec 11 Feb 2010 17:56:54 -0000 1.44
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
Version: 11
-Release: 0.32
+Release: 0.33
Summary: Tools and files used by the %{repo} buildsys
Group: Development/Tools
@@ -90,6 +90,9 @@
%changelog
+* Thu Feb 11 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:11-0.33
+- rebuild for kernel 2.6.30.10-105.2.23.fc11
+
* Mon Feb 08 2010 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 10:11-0.32
- rebuild for kernel 2.6.30.10-105.2.16.fc11
14 years, 9 months
rpms/cairo-dock/F-12 cairo-dock-2.1.3.2-DSO.patch, NONE, 1.1 .cvsignore, 1.32, 1.33 cairo-dock.spec, 1.41, 1.42 sources, 1.34, 1.35 cairo-dock-plugins-2.1.2.4-showDesklets.patch, 1.1, NONE xorg-x11-proto-devel-workaround-bz505774.patch, 1.1, NONE
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22791/F-12
Modified Files:
.cvsignore cairo-dock.spec sources
Added Files:
cairo-dock-2.1.3.2-DSO.patch
Removed Files:
cairo-dock-plugins-2.1.2.4-showDesklets.patch
xorg-x11-proto-devel-workaround-bz505774.patch
Log Message:
* Fri Feb 12 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.3.2-1
- 2.1.3-2
cairo-dock-2.1.3.2-DSO.patch:
configure.ac | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE cairo-dock-2.1.3.2-DSO.patch ---
--- cairo-dock-2.1.3-2/configure.ac.debug 2010-02-07 23:15:52.000000000 +0900
+++ cairo-dock-2.1.3-2/configure.ac 2010-02-12 02:22:45.000000000 +0900
@@ -35,6 +35,8 @@
# Checks for library functions.
# AC_CHECK_FUNCS([sscanf])
+AC_CHECK_LIB(m,sin)
+
PKG_CHECK_MODULES(PACKAGE, "gtk+-2.0 gthread-2.0 cairo librsvg-2.0 dbus-1 dbus-glib-1 libxml-2.0 gtkglext-1.0 xrender")
AC_ARG_ENABLE(xextend,
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-12/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore 17 Dec 2009 20:53:01 -0000 1.32
+++ .cvsignore 11 Feb 2010 17:53:32 -0000 1.33
@@ -1,3 +1,2 @@
-cairo-dock-2.1.2-4.tar.gz
-cairo-dock-plugins-2.1.2-4.tar.gz
-cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
+cairo-dock-2.1.3-2.tar.gz
+cairo-dock-plugins-2.1.3-2.tar.gz
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-12/cairo-dock.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- cairo-dock.spec 17 Dec 2009 20:53:01 -0000 1.41
+++ cairo-dock.spec 11 Feb 2010 17:53:32 -0000 1.42
@@ -17,9 +17,9 @@
%global build_other 1
%global urlver 2.1
-%global mainver 2.1.2
+%global mainver 2.1.3
%undefine betaver
-%global postver 4
+%global postver 2
%global build_webkit 1
%global build_xfce 1
@@ -50,14 +50,14 @@
%endif
# Temporarily
# pulled from plug-ins 2.1.x branch rev 1449
-Source10: cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
+#Source10: cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# plug-ins specific patches
Patch100: cairo-dock-rev1677-stacks.patch
-Patch101: cairo-dock-plugins-2.1.2.4-showDesklets.patch
+Patch101: cairo-dock-2.1.3.2-DSO.patch
-# For patch101
+# Patch101 needs autotool
#%%if ! %{released}
BuildRequires: automake
BuildRequires: libtool
@@ -86,6 +86,7 @@
BuildRequires: libexif-devel
BuildRequires: libgnomeui-devel
BuildRequires: libxklavier-devel
+BuildRequires: libXrandr-devel
BuildRequires: libXxf86vm-devel
BuildRequires: vte-devel
# Not shown in .pc files
@@ -177,13 +178,6 @@
%endif
###
-###
-# Temporarily
-cd plug-ins
-gzip -dc %{SOURCE10} | tar xf -
-cd ..
-###
-
%if 0
find . -type d -name \.svn | sort -r | xargs %{__rm} -rf
find . -type d -name \*CVS\* | sort -r | xargs %{__rm} -rf
@@ -195,6 +189,7 @@
cd cairo-dock
# Patch
+%patch101 -p1 -b .dso
# permission
for dir in */
@@ -213,6 +208,10 @@
autoreconf -i -f
%endif
+# For Patch101
+autoreconf -i -f
+
+
# desktop file
%{__sed} -i.icon \
-e 's|Icon=\*|Icon=cairo-dock|' \
@@ -229,9 +228,6 @@
# source code fix
-# showDesklets
-%patch101 -p0 -b .miss
-
# stacks: directory fix
%if 0%{?released} < 1
%patch100 -p0 -b .compile
@@ -261,12 +257,6 @@
%{__sed} -i.1 -e '\@po/@d' Subdirs.list
fi
-## Patch101 needs autotools
-## Call here
-autoreconf -fi
-##
-##
-
for dir in */
do
skip=0
@@ -337,9 +327,7 @@
%configure \
--enable-gio-in-gmenu \
--enable-network-monitor \
- --enable-rssreader \
--enable-scooby-do \
- --enable-show-desklets
# Workaround to avoid endless loop on po/
@@ -596,6 +584,12 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Fri Feb 12 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.3.2-1
+- 2.1.3-2
+
+* Sun Jan 17 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
+- F-13: Rebuild for libxklavier soname bump
+
* Fri Dec 18 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.2.4-1
- 2.1.2-4
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-12/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources 17 Dec 2009 20:53:01 -0000 1.34
+++ sources 11 Feb 2010 17:53:32 -0000 1.35
@@ -1,3 +1,2 @@
-23815db69c97e751244bbef4a9882233 cairo-dock-2.1.2-4.tar.gz
-920d12c052a3c4a5be8a43a33c718d9b cairo-dock-plugins-2.1.2-4.tar.gz
-04a3dcc316b37f8880625b0cb0b46784 cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
+e432c2623a052efbe2b3daffdfbf7754 cairo-dock-2.1.3-2.tar.gz
+7b02ee33d0b1c08d212c8f29e009d336 cairo-dock-plugins-2.1.3-2.tar.gz
--- cairo-dock-plugins-2.1.2.4-showDesklets.patch DELETED ---
--- xorg-x11-proto-devel-workaround-bz505774.patch DELETED ---
14 years, 9 months
rpms/cairo-dock/F-11 cairo-dock-2.1.3.2-DSO.patch, NONE, 1.1 .cvsignore, 1.24, 1.25 cairo-dock.spec, 1.32, 1.33 sources, 1.26, 1.27 cairo-dock-plugins-2.1.2.4-showDesklets.patch, 1.1, NONE
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22791/F-11
Modified Files:
.cvsignore cairo-dock.spec sources
Added Files:
cairo-dock-2.1.3.2-DSO.patch
Removed Files:
cairo-dock-plugins-2.1.2.4-showDesklets.patch
Log Message:
* Fri Feb 12 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.3.2-1
- 2.1.3-2
cairo-dock-2.1.3.2-DSO.patch:
configure.ac | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE cairo-dock-2.1.3.2-DSO.patch ---
--- cairo-dock-2.1.3-2/configure.ac.debug 2010-02-07 23:15:52.000000000 +0900
+++ cairo-dock-2.1.3-2/configure.ac 2010-02-12 02:22:45.000000000 +0900
@@ -35,6 +35,8 @@
# Checks for library functions.
# AC_CHECK_FUNCS([sscanf])
+AC_CHECK_LIB(m,sin)
+
PKG_CHECK_MODULES(PACKAGE, "gtk+-2.0 gthread-2.0 cairo librsvg-2.0 dbus-1 dbus-glib-1 libxml-2.0 gtkglext-1.0 xrender")
AC_ARG_ENABLE(xextend,
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 17 Dec 2009 20:53:00 -0000 1.24
+++ .cvsignore 11 Feb 2010 17:53:31 -0000 1.25
@@ -1,3 +1,2 @@
-cairo-dock-2.1.2-4.tar.gz
-cairo-dock-plugins-2.1.2-4.tar.gz
-cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
+cairo-dock-2.1.3-2.tar.gz
+cairo-dock-plugins-2.1.3-2.tar.gz
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/cairo-dock.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- cairo-dock.spec 17 Dec 2009 20:53:00 -0000 1.32
+++ cairo-dock.spec 11 Feb 2010 17:53:31 -0000 1.33
@@ -17,9 +17,9 @@
%global build_other 1
%global urlver 2.1
-%global mainver 2.1.2
+%global mainver 2.1.3
%undefine betaver
-%global postver 4
+%global postver 2
%global build_webkit 1
%global build_xfce 1
@@ -50,14 +50,14 @@
%endif
# Temporarily
# pulled from plug-ins 2.1.x branch rev 1449
-Source10: cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
+#Source10: cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# plug-ins specific patches
Patch100: cairo-dock-rev1677-stacks.patch
-Patch101: cairo-dock-plugins-2.1.2.4-showDesklets.patch
+Patch101: cairo-dock-2.1.3.2-DSO.patch
-# For patch101
+# Patch101 needs autotool
#%%if ! %{released}
BuildRequires: automake
BuildRequires: libtool
@@ -86,6 +86,7 @@
BuildRequires: libexif-devel
BuildRequires: libgnomeui-devel
BuildRequires: libxklavier-devel
+BuildRequires: libXrandr-devel
BuildRequires: libXxf86vm-devel
BuildRequires: vte-devel
# Not shown in .pc files
@@ -177,13 +178,6 @@
%endif
###
-###
-# Temporarily
-cd plug-ins
-gzip -dc %{SOURCE10} | tar xf -
-cd ..
-###
-
%if 0
find . -type d -name \.svn | sort -r | xargs %{__rm} -rf
find . -type d -name \*CVS\* | sort -r | xargs %{__rm} -rf
@@ -195,6 +189,7 @@
cd cairo-dock
# Patch
+%patch101 -p1 -b .dso
# permission
for dir in */
@@ -213,6 +208,10 @@
autoreconf -i -f
%endif
+# For Patch101
+autoreconf -i -f
+
+
# desktop file
%{__sed} -i.icon \
-e 's|Icon=\*|Icon=cairo-dock|' \
@@ -229,9 +228,6 @@
# source code fix
-# showDesklets
-%patch101 -p0 -b .miss
-
# stacks: directory fix
%if 0%{?released} < 1
%patch100 -p0 -b .compile
@@ -261,12 +257,6 @@
%{__sed} -i.1 -e '\@po/@d' Subdirs.list
fi
-## Patch101 needs autotools
-## Call here
-autoreconf -fi
-##
-##
-
for dir in */
do
skip=0
@@ -337,9 +327,7 @@
%configure \
--enable-gio-in-gmenu \
--enable-network-monitor \
- --enable-rssreader \
--enable-scooby-do \
- --enable-show-desklets
# Workaround to avoid endless loop on po/
@@ -596,6 +584,12 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Fri Feb 12 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.3.2-1
+- 2.1.3-2
+
+* Sun Jan 17 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
+- F-13: Rebuild for libxklavier soname bump
+
* Fri Dec 18 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.2.4-1
- 2.1.2-4
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources 17 Dec 2009 20:53:00 -0000 1.26
+++ sources 11 Feb 2010 17:53:31 -0000 1.27
@@ -1,3 +1,2 @@
-23815db69c97e751244bbef4a9882233 cairo-dock-2.1.2-4.tar.gz
-920d12c052a3c4a5be8a43a33c718d9b cairo-dock-plugins-2.1.2-4.tar.gz
-04a3dcc316b37f8880625b0cb0b46784 cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
+e432c2623a052efbe2b3daffdfbf7754 cairo-dock-2.1.3-2.tar.gz
+7b02ee33d0b1c08d212c8f29e009d336 cairo-dock-plugins-2.1.3-2.tar.gz
--- cairo-dock-plugins-2.1.2.4-showDesklets.patch DELETED ---
14 years, 9 months
rpms/cairo-dock/devel cairo-dock-2.1.3.2-DSO.patch, NONE, 1.1 .cvsignore, 1.32, 1.33 cairo-dock.spec, 1.43, 1.44 sources, 1.34, 1.35 cairo-dock-plugins-2.1.2.4-showDesklets.patch, 1.1, NONE xorg-x11-proto-devel-workaround-bz505774.patch, 1.1, NONE
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv22791/devel
Modified Files:
.cvsignore cairo-dock.spec sources
Added Files:
cairo-dock-2.1.3.2-DSO.patch
Removed Files:
cairo-dock-plugins-2.1.2.4-showDesklets.patch
xorg-x11-proto-devel-workaround-bz505774.patch
Log Message:
* Fri Feb 12 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.3.2-1
- 2.1.3-2
cairo-dock-2.1.3.2-DSO.patch:
configure.ac | 2 ++
1 file changed, 2 insertions(+)
--- NEW FILE cairo-dock-2.1.3.2-DSO.patch ---
--- cairo-dock-2.1.3-2/configure.ac.debug 2010-02-07 23:15:52.000000000 +0900
+++ cairo-dock-2.1.3-2/configure.ac 2010-02-12 02:22:45.000000000 +0900
@@ -35,6 +35,8 @@
# Checks for library functions.
# AC_CHECK_FUNCS([sscanf])
+AC_CHECK_LIB(m,sin)
+
PKG_CHECK_MODULES(PACKAGE, "gtk+-2.0 gthread-2.0 cairo librsvg-2.0 dbus-1 dbus-glib-1 libxml-2.0 gtkglext-1.0 xrender")
AC_ARG_ENABLE(xextend,
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore 17 Dec 2009 20:53:01 -0000 1.32
+++ .cvsignore 11 Feb 2010 17:53:32 -0000 1.33
@@ -1,3 +1,2 @@
-cairo-dock-2.1.2-4.tar.gz
-cairo-dock-plugins-2.1.2-4.tar.gz
-cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
+cairo-dock-2.1.3-2.tar.gz
+cairo-dock-plugins-2.1.3-2.tar.gz
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- cairo-dock.spec 17 Jan 2010 10:29:50 -0000 1.43
+++ cairo-dock.spec 11 Feb 2010 17:53:32 -0000 1.44
@@ -17,14 +17,14 @@
%global build_other 1
%global urlver 2.1
-%global mainver 2.1.2
+%global mainver 2.1.3
%undefine betaver
-%global postver 4
+%global postver 2
%global build_webkit 1
%global build_xfce 1
-%global fedora_main_rel 2
+%global fedora_main_rel 1
%global fedora_rel %{?pre_release:0.}%{fedora_main_rel}%{?betaver:.%betaver}
@@ -50,14 +50,14 @@
%endif
# Temporarily
# pulled from plug-ins 2.1.x branch rev 1449
-Source10: cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
+#Source10: cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# plug-ins specific patches
Patch100: cairo-dock-rev1677-stacks.patch
-Patch101: cairo-dock-plugins-2.1.2.4-showDesklets.patch
+Patch101: cairo-dock-2.1.3.2-DSO.patch
-# For patch101
+# Patch101 needs autotool
#%%if ! %{released}
BuildRequires: automake
BuildRequires: libtool
@@ -85,14 +85,8 @@
BuildRequires: gnome-vfs2-devel
BuildRequires: libexif-devel
BuildRequires: libgnomeui-devel
-# Make sure that cairo-dock is rebuilt against new libxklavier
-# (It takes some time for rpmfusion buildsyss to get synced to
-# fedora buildsys)
-%if 0%{?fedora} >= 13
-BuildRequires: libxklavier-devel >= 5.0
-%else
BuildRequires: libxklavier-devel
-%endif
+BuildRequires: libXrandr-devel
BuildRequires: libXxf86vm-devel
BuildRequires: vte-devel
# Not shown in .pc files
@@ -184,13 +178,6 @@
%endif
###
-###
-# Temporarily
-cd plug-ins
-gzip -dc %{SOURCE10} | tar xf -
-cd ..
-###
-
%if 0
find . -type d -name \.svn | sort -r | xargs %{__rm} -rf
find . -type d -name \*CVS\* | sort -r | xargs %{__rm} -rf
@@ -202,6 +189,7 @@
cd cairo-dock
# Patch
+%patch101 -p1 -b .dso
# permission
for dir in */
@@ -220,6 +208,10 @@
autoreconf -i -f
%endif
+# For Patch101
+autoreconf -i -f
+
+
# desktop file
%{__sed} -i.icon \
-e 's|Icon=\*|Icon=cairo-dock|' \
@@ -236,9 +228,6 @@
# source code fix
-# showDesklets
-%patch101 -p0 -b .miss
-
# stacks: directory fix
%if 0%{?released} < 1
%patch100 -p0 -b .compile
@@ -268,12 +257,6 @@
%{__sed} -i.1 -e '\@po/@d' Subdirs.list
fi
-## Patch101 needs autotools
-## Call here
-autoreconf -fi
-##
-##
-
for dir in */
do
skip=0
@@ -344,9 +327,7 @@
%configure \
--enable-gio-in-gmenu \
--enable-network-monitor \
- --enable-rssreader \
--enable-scooby-do \
- --enable-show-desklets
# Workaround to avoid endless loop on po/
@@ -603,8 +584,11 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Fri Feb 12 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.3.2-1
+- 2.1.3-2
+
* Sun Jan 17 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
-- Rebuild for libxklavier soname bump
+- F-13: Rebuild for libxklavier soname bump
* Fri Dec 18 2009 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.2.4-1
- 2.1.2-4
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources 17 Dec 2009 20:53:01 -0000 1.34
+++ sources 11 Feb 2010 17:53:32 -0000 1.35
@@ -1,3 +1,2 @@
-23815db69c97e751244bbef4a9882233 cairo-dock-2.1.2-4.tar.gz
-920d12c052a3c4a5be8a43a33c718d9b cairo-dock-plugins-2.1.2-4.tar.gz
-04a3dcc316b37f8880625b0cb0b46784 cairo-dock-plugins-2.1.2.4-missingfiles.tar.gz
+e432c2623a052efbe2b3daffdfbf7754 cairo-dock-2.1.3-2.tar.gz
+7b02ee33d0b1c08d212c8f29e009d336 cairo-dock-plugins-2.1.3-2.tar.gz
--- cairo-dock-plugins-2.1.2.4-showDesklets.patch DELETED ---
--- xorg-x11-proto-devel-workaround-bz505774.patch DELETED ---
14 years, 9 months