rpms/xorg-x11-drv-nvidia/F-9 xorg-x11-drv-nvidia.spec,1.5,1.6
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21309
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
Even more cleaning
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-9/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xorg-x11-drv-nvidia.spec 6 Nov 2008 15:04:23 -0000 1.5
+++ xorg-x11-drv-nvidia.spec 6 Nov 2008 15:14:36 -0000 1.6
@@ -238,20 +238,7 @@
%{_initrddir}/nvidia stop &> /dev/null ||:
/sbin/chkconfig --del nvidia ||:
fi ||:
-# Remove all entries of nvidia/NVdriver from modprobe.conf
-# Start using modprobe.d as of FC5
-# This can be removed eventually
-# Make a backup of the backup
-if [ -f %{_sysconfdir}/modprobe.conf.backup-nvidia-glx ]; then
- mv %{_sysconfdir}/modprobe.conf.backup-nvidia-glx %{_sysconfdir}/modprobe.conf.backup-nvidia ||:
-fi
-if [ -f %{_sysconfdir}/modprobe.conf.backup-nvidia ]; then
- mv %{_sysconfdir}/modprobe.conf.backup-nvidia %{_sysconfdir}/modprobe.conf.backup-nvidia-old ||:
-fi
-if [ -f %{_sysconfdir}/modprobe.conf ]; then
- mv %{_sysconfdir}/modprobe.conf %{_sysconfdir}/modprobe.conf.backup-nvidia ||:
- grep -v -E -e "^alias +[^ ]+ +(nvidia|NVdriver)" -e "options nvidia " %{_sysconfdir}/modprobe.conf.backup-nvidia > %{_sysconfdir}/modprobe.conf ||:
-fi
+
%postun libs -p /sbin/ldconfig
15 years, 5 months
rpms/xorg-x11-drv-nvidia/F-9 .cvsignore,1.3,1.4 sources,1.3,1.4
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21005
Modified Files:
.cvsignore sources
Log Message:
Add both arches
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 6 Nov 2008 15:04:58 -0000 1.3
+++ .cvsignore 6 Nov 2008 15:11:23 -0000 1.4
@@ -1,2 +1,2 @@
NVIDIA-Linux-x86_64-173.14.15-pkg0.run
-NVIDIA-Linux-x86_64-173.14.15-pkg0.run
+NVIDIA-Linux-x86-173.14.15-pkg0.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 6 Nov 2008 15:04:58 -0000 1.3
+++ sources 6 Nov 2008 15:11:23 -0000 1.4
@@ -1,2 +1,2 @@
1765b224411d47ba5d91b91e261d9b37 NVIDIA-Linux-x86_64-173.14.15-pkg0.run
-1765b224411d47ba5d91b91e261d9b37 NVIDIA-Linux-x86_64-173.14.15-pkg0.run
+dacde3365e697fb22e6089d8e3cda4a0 NVIDIA-Linux-x86-173.14.15-pkg0.run
15 years, 5 months
rpms/xorg-x11-drv-nvidia/F-9 .cvsignore,1.2,1.3 sources,1.2,1.3
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20653
Modified Files:
.cvsignore sources
Log Message:
Update
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-9/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 5 Oct 2008 12:26:41 -0000 1.2
+++ .cvsignore 6 Nov 2008 15:04:58 -0000 1.3
@@ -1,2 +1,2 @@
-NVIDIA-Linux-x86-173.14.12-pkg0.run
-NVIDIA-Linux-x86_64-173.14.12-pkg0.run
+NVIDIA-Linux-x86_64-173.14.15-pkg0.run
+NVIDIA-Linux-x86_64-173.14.15-pkg0.run
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 5 Oct 2008 12:26:41 -0000 1.2
+++ sources 6 Nov 2008 15:04:58 -0000 1.3
@@ -1,2 +1,2 @@
-76b8eba1b14fc273a1a4044705b0aa56 NVIDIA-Linux-x86-173.14.12-pkg0.run
-8675e4ca65033b343c8c77b2ce82e71d NVIDIA-Linux-x86_64-173.14.12-pkg0.run
+1765b224411d47ba5d91b91e261d9b37 NVIDIA-Linux-x86_64-173.14.15-pkg0.run
+1765b224411d47ba5d91b91e261d9b37 NVIDIA-Linux-x86_64-173.14.15-pkg0.run
15 years, 5 months
rpms/xorg-x11-drv-nvidia/F-9 xorg-x11-drv-nvidia.spec,1.4,1.5
by Nicolas Chauvet
Author: kwizart
Update of /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20572
Modified Files:
xorg-x11-drv-nvidia.spec
Log Message:
- Update to 173.14.15 (beta) for 2.6.27 kernels
Index: xorg-x11-drv-nvidia.spec
===================================================================
RCS file: /cvs/nonfree/rpms/xorg-x11-drv-nvidia/F-9/xorg-x11-drv-nvidia.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xorg-x11-drv-nvidia.spec 4 Nov 2008 17:36:04 -0000 1.4
+++ xorg-x11-drv-nvidia.spec 6 Nov 2008 15:04:23 -0000 1.5
@@ -7,23 +7,19 @@
%endif
Name: xorg-x11-drv-nvidia
-Version: 173.14.12
-Release: 6%{?dist}
+Version: 173.14.15
+Release: 1%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
Group: User Interface/X Hardware Support
License: Redistributable, no modification permitted
URL: http://www.nvidia.com/
-Source0: http://us.download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x...
-Source1: http://us.download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linu...
-Source2: nvidia.sh
-Source3: nvidia.csh
+Source0: ftp://download.nvidia.com/XFree86/Linux-x86/%{version}/NVIDIA-Linux-x86-%...
+Source1: ftp://download.nvidia.com/XFree86/Linux-x86_64/%{version}/NVIDIA-Linux-x8...
Source4: nvidia-settings.desktop
Source5: nvidia-init
-Source6: 60-nvidia.nodes
Source10: nvidia-config-display
Source11: nvidia-README.Fedora
-Source12: nvidia.opts
# So we don't pull other nvidia variants
Source91: filter-requires.sh
%define _use_internal_dependency_generator 0
@@ -45,6 +41,7 @@
%ifarch x86_64
Requires: %{nvidialibdir}/libGL.so.%{version}
%endif
+
Requires(post): livna-config-display
Requires(preun): livna-config-display
Requires(post): chkconfig
@@ -53,7 +50,10 @@
Provides: nvidia-kmod-common = %{version}
Conflicts: xorg-x11-drv-nvidia-legacy
+Conflicts: xorg-x11-drv-nvidia-71xx
Conflicts: xorg-x11-drv-nvidia-96xx
+Conflicts: xorg-x11-drv-nvidia-beta
+Conflicts: xorg-x11-drv-nvidia-newest
Conflicts: xorg-x11-drv-fglrx
Obsoletes: nvidia-kmod < %{version}
@@ -194,10 +194,6 @@
ln -s libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libcuda.so.1
ln -s libcuda.so.%{version} $RPM_BUILD_ROOT%{nvidialibdir}/libcuda.so
-# profile.d files
-install -D -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/nvidia.sh
-install -D -p -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/nvidia.csh
-
# X configuration script
install -D -p -m 0755 %{SOURCE10} $RPM_BUILD_ROOT%{_sbindir}/nvidia-config-display
@@ -209,20 +205,9 @@
# Install initscript
install -D -p -m 0755 %{SOURCE5} $RPM_BUILD_ROOT%{_initrddir}/nvidia
-# udev node file
-install -D -p -m 0664 %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d/60-nvidia.nodes
-
-# modprobe.d file
-install -D -p -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/nvidia
-
# ld.so.conf.d file
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/
-%ifarch %{ix86}
-echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-x86.conf
-%endif
-%ifarch x86_64
-echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-x86_64.conf
-%endif
+echo "%{nvidialibdir}" > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d/nvidia-%{_libs}.conf
# Change perms on static libs. Can't fathom how to do it nicely above.
find $RPM_BUILD_ROOT/%{nvidialibdir} -type f -name "*.a" -exec chmod 0644 '{}' \;
@@ -273,9 +258,6 @@
%files
%defattr(-,root,root,-)
%doc nvidiapkg/usr/share/doc/*
-%config(noreplace) %{_sysconfdir}/profile.d/nvidia*
-%config %{_sysconfdir}/modprobe.d/nvidia
-%{_sysconfdir}/udev/makedev.d/60-nvidia.nodes
%{_initrddir}/nvidia
%{_bindir}/*
%{_sbindir}/*
@@ -287,11 +269,7 @@
%{_datadir}/applications/*nvidia-settings.desktop
%{_datadir}/pixmaps/*.png
%{_mandir}/man[1-9]/nvidia*.*
-%verify (not user) %attr(0600,root,root) %dev(c,195,0) /dev/nvidia0
-%verify (not user) %attr(0600,root,root) %dev(c,195,1) /dev/nvidia1
-%verify (not user) %attr(0600,root,root) %dev(c,195,2) /dev/nvidia2
-%verify (not user) %attr(0600,root,root) %dev(c,195,3) /dev/nvidia3
-%verify (not user) %attr(0600,root,root) %dev(c,195,255) /dev/nvidiactl
+
%files libs
%defattr(-,root,root,-)
@@ -312,6 +290,10 @@
%changelog
+* Thu Nov 6 2008 kwizart < kwizart at gmail.com > - 173.14.15-1
+- Update to 173.14.15 (beta) for 2.6.27 kernels
+- Drop some legacy devices checks
+
* Tue Nov 4 2008 Stewart Adam <s.adam at diffingo.com> - 173.14.12-6
- Fix upgrade path for FreshRPMs users
15 years, 5 months
rpms/qc-usb-kmod/F-9 qc-usb-0.6.6-2.6.27.patch, NONE, 1.1 qc-usb-kmod.spec, 1.5, 1.6
by Thorsten Leemhuis
Author: thl
Update of /cvs/free/rpms/qc-usb-kmod/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12193
Modified Files:
qc-usb-kmod.spec
Added Files:
qc-usb-0.6.6-2.6.27.patch
Log Message:
* Thu Nov 06 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.6.6-42
- Add 2.6.27 patch
qc-usb-0.6.6-2.6.27.patch:
--- NEW FILE qc-usb-0.6.6-2.6.27.patch ---
Here are two fixes for compiling quickcam module with newer kernels.
In 2.6.27-rc1 :
1) the type field was removed from the video_device structure.
2) the parent of the video device was renamed from dev to parent.
--- qc-usb-0.6.6/qc-driver.c.2.6.27 2008-10-15 21:40:01.000000000 +0200
+++ qc-usb-0.6.6/qc-driver.c 2008-10-15 21:40:01.000000000 +0200
@@ -2528,7 +2528,7 @@
if (qcdebug&QC_DEBUGUSER) PDEBUG("VIDIOCGCAP");
memset(&b, 0, sizeof(b));
strcpy(b.name, "Logitech QuickCam USB"); /* Max 31 characters */
- b.type = qc->vdev.type;
+ b.type = VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE;
b.channels = 1;
b.audios = 0;
b.maxwidth = qc->sensor_data.maxwidth;
@@ -3007,7 +3007,6 @@
static struct video_device qc_v4l_template = {
name: "QuickCam USB",
- type: VID_TYPE_CAPTURE | VID_TYPE_SUBCAPTURE,
#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
hardware: VID_HARDWARE_QCAM_USB,
#endif
Index: qc-usb-kmod.spec
===================================================================
RCS file: /cvs/free/rpms/qc-usb-kmod/F-9/qc-usb-kmod.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qc-usb-kmod.spec 6 Nov 2008 11:09:28 -0000 1.5
+++ qc-usb-kmod.spec 6 Nov 2008 12:26:34 -0000 1.6
@@ -7,7 +7,7 @@
Name: qc-usb-kmod
Version: 0.6.6
-Release: 41%{?dist}.3
+Release: 42%{?dist}.1
Summary: qc-usb kernel modules
Group: System Environment/Kernel
@@ -17,6 +17,8 @@
Patch0: qc-usb-0.6.6-2.6.24.patch
# from http://patch-tracking.debian.net/patch/series/view/qc-usb/0.6.6-6/kcompat...
Patch1: qc-usb-0.6.6-2.6.26.patch
+# this comes from mandriva package
+Patch2: qc-usb-0.6.6-2.6.27.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# needed for plague to make sure it builds for i586 and i686
@@ -42,6 +44,7 @@
%setup -q -c -T -a 0
%patch0 -p0 -b .2.6.24
%patch1 -p0 -b .2.6.26
+%patch2 -p0 -b .2.6.27
for kernel_version in %{?kernel_versions}; do
cp -a qc-usb-%{version} _kmod_build_${kernel_version%%___*}
done
@@ -67,6 +70,9 @@
%changelog
+* Thu Nov 06 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.6.6-42
+- Add 2.6.27 patch
+
* Thu Nov 06 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.6.6-41.3
- rebuild for latest Fedora kernel;
15 years, 5 months
rpms/unrar/F-9 unrar.spec,1.3,1.4
by Andreas Thienemann
Author: ixs
Update of /cvs/nonfree/rpms/unrar/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10408
Modified Files:
unrar.spec
Log Message:
build unrar binary. typo
Index: unrar.spec
===================================================================
RCS file: /cvs/nonfree/rpms/unrar/F-9/unrar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- unrar.spec 6 Nov 2008 11:43:59 -0000 1.3
+++ unrar.spec 6 Nov 2008 11:54:04 -0000 1.4
@@ -47,10 +47,10 @@
%build
+make %{?_smp_mflags} -f makefile.unix \
+ CXX="%{__cxx}" CXXFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" STRIP=: RANLIB=ranlib
make %{?_smp_mflags} -f makefile.unix lib \
CXX="%{__cxx}" CXXFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" STRIP=: RANLIB=ranlib
-#make %{?_smp_mflags} -f makefile.unix \
-# CXX="%{__cxx}" CXXFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" STRIP=: RANLIB=ranlib
%install
15 years, 5 months
rpms/comical/F-9 comical-0.8-libunrar.patch, NONE, 1.1 comical-0.8-minizip.patch, NONE, 1.1 comical.spec, 1.2, 1.3
by Andreas Thienemann
Author: ixs
Update of /cvs/nonfree/rpms/comical/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10020
Modified Files:
comical.spec
Added Files:
comical-0.8-libunrar.patch comical-0.8-minizip.patch
Log Message:
* Sun Oct 26 2008 Andreas Thienemann <andreas(a)bawue.net> - 0.8-9
- Removed use of private miniunzip copy, use system-wide minizip library.
comical-0.8-libunrar.patch:
--- NEW FILE comical-0.8-libunrar.patch ---
diff -up comical-0.8/Makefile.orig comical-0.8/Makefile
--- comical-0.8/Makefile.orig 2008-10-25 23:52:38.000000000 +0200
+++ comical-0.8/Makefile 2008-10-25 23:53:11.000000000 +0200
@@ -1,5 +1,5 @@
CC = `wx-config --cxx`
-LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip
+LDFLAGS = `wx-config --libs` -lunrar -Lunzip -lminiunzip
INSTALL = install
INSTALL_PROGRAM = $(INSTALL)
prefix = /usr/local
@@ -12,15 +12,12 @@ OBJS = $(patsubst %.cpp,%.o,$(wildcard s
all: comical
-comical: $(OBJS) unrar/libunrar.a unzip/libminiunzip.a
+comical: $(OBJS) unzip/libminiunzip.a
$(CC) -o $@ $(OBJS) $(LDFLAGS)
$(OBJS):
$(MAKE) -C src
-unrar/libunrar.a:
- $(MAKE) lib -C unrar -f makefile.linux
-
unzip/libminiunzip.a:
$(MAKE) -C unzip
@@ -39,7 +36,6 @@ clean:
distclean:
$(MAKE) clean
- $(MAKE) clean -C unrar -f makefile.linux
$(MAKE) clean -C unzip
rm -f $(DEPS) bin2h src/bin2h.o
diff -up comical-0.8/src/ComicBookRAR.h.orig comical-0.8/src/ComicBookRAR.h
--- comical-0.8/src/ComicBookRAR.h.orig 2008-10-25 23:53:32.000000000 +0200
+++ comical-0.8/src/ComicBookRAR.h 2008-10-25 23:53:41.000000000 +0200
@@ -29,7 +29,7 @@
#define _ComicBookRAR_h_
#include "ComicBook.h"
-#include "dll.hpp"
+#include "unrar/dll.hpp"
class ComicBookRAR : public ComicBook {
diff -up comical-0.8/src/Makefile.orig comical-0.8/src/Makefile
--- comical-0.8/src/Makefile.orig 2008-10-25 23:53:15.000000000 +0200
+++ comical-0.8/src/Makefile 2008-10-25 23:53:22.000000000 +0200
@@ -1,4 +1,4 @@
-INCLUDE = -I../unrar -I../unzip
+INCLUDE = -I../unzip
CFLAGS = -O2 -Wall -pipe $(RPM_OPT_FLAGS)
CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
comical-0.8-minizip.patch:
--- NEW FILE comical-0.8-minizip.patch ---
diff -up comical-0.8/Makefile.orig comical-0.8/Makefile
--- comical-0.8/Makefile.orig 2008-10-26 00:23:56.000000000 +0200
+++ comical-0.8/Makefile 2008-10-26 00:24:29.000000000 +0200
@@ -1,5 +1,5 @@
CC = `wx-config --cxx`
-LDFLAGS = `wx-config --libs` -lunrar -Lunzip -lminiunzip
+LDFLAGS = `wx-config --libs` `pkg-config minizip --libs` -lunrar
INSTALL = install
INSTALL_PROGRAM = $(INSTALL)
prefix = /usr/local
@@ -12,15 +12,12 @@ OBJS = $(patsubst %.cpp,%.o,$(wildcard s
all: comical
-comical: $(OBJS) unzip/libminiunzip.a
+comical: $(OBJS)
$(CC) -o $@ $(OBJS) $(LDFLAGS)
$(OBJS):
$(MAKE) -C src
-unzip/libminiunzip.a:
- $(MAKE) -C unzip
-
install: comical
$(INSTALL_PROGRAM) comical $(DESTDIR)$(bindir)/comical
@@ -36,7 +33,6 @@ clean:
distclean:
$(MAKE) clean
- $(MAKE) clean -C unzip
rm -f $(DEPS) bin2h src/bin2h.o
.PHONY : install install-strip uninstall clean distclean
diff -up comical-0.8/src/ComicBookZIP.cpp.orig comical-0.8/src/ComicBookZIP.cpp
diff -up comical-0.8/src/Makefile.orig comical-0.8/src/Makefile
--- comical-0.8/src/Makefile.orig 2008-10-26 00:24:36.000000000 +0200
+++ comical-0.8/src/Makefile 2008-10-26 00:25:44.000000000 +0200
@@ -1,4 +1,4 @@
-INCLUDE = -I../unzip
+INCLUDE = `pkg-config minizip --cflags`
CFLAGS = -O2 -Wall -pipe $(RPM_OPT_FLAGS)
CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
Index: comical.spec
===================================================================
RCS file: /cvs/nonfree/rpms/comical/F-9/comical.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- comical.spec 16 Oct 2008 18:13:03 -0000 1.2
+++ comical.spec 6 Nov 2008 11:51:41 -0000 1.3
@@ -1,6 +1,6 @@
Name: comical
Version: 0.8
-Release: 7%{?dist}
+Release: 9%{?dist}
Summary: GUI comic book viewer
License: GPLv2
Group: Applications/Multimedia
@@ -11,37 +11,49 @@
Patch0: comical-0.8-jpe.patch
Patch1: comical-0.8-optflags.patch
Patch2: comical-0.8-wxicon.patch
+Patch3: comical-0.8-libunrar.patch
+Patch4: comical-0.8-minizip.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: wxGTK2-devel
BuildRequires: desktop-file-utils
-Requires: unzip
+BuildRequires: libunrar-devel
+BuildRequires: minizip-devel
+BuildRequires: pkgconfig
+
%description
Comical is a fully featured GUI comic book viewer using wxWidgets. It
can view CBZ and CBR format files.
+
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+rm -rf unrar unzip
+
%build
make
+
%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m0755 comical $RPM_BUILD_ROOT%{_bindir}
-
-install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
-desktop-file-install --vendor livna \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- --add-category X-Livna \
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_bindir}
+install -m0755 comical %{buildroot}%{_bindir}
+
+install -p -D -m0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+desktop-file-install \
+ --dir %{buildroot}%{_datadir}/applications \
%{SOURCE2}
+
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
%files
%defattr(-,root,root)
@@ -50,14 +62,21 @@
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/%{name}.png
+
%changelog
-* Thu Oct 16 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8-7
+* Sun Oct 26 2008 Andreas Thienemann <andreas(a)bawue.net> - 0.8-9
+- Removed use of private miniunzip copy, use system-wide minizip library.
+
+* Sat Oct 25 2008 Andreas Thienemann <andreas(a)bawue.net> - 0.8-8
+- Removed use of private libunrar copy, use system-wide one.
+
+* Thu Oct 16 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.8-7
- rebuild
* Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.8-6
- Fix building with latest wxWidgets
-* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8-5
+* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.8-5
- rebuild
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.8-4
15 years, 5 months
rpms/unrar/F-9 unrar.spec,1.2,1.3
by Andreas Thienemann
Author: ixs
Update of /cvs/nonfree/rpms/unrar/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9618
Modified Files:
unrar.spec
Log Message:
unbump
Index: unrar.spec
===================================================================
RCS file: /cvs/nonfree/rpms/unrar/F-9/unrar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unrar.spec 6 Nov 2008 11:43:15 -0000 1.2
+++ unrar.spec 6 Nov 2008 11:43:59 -0000 1.3
@@ -3,7 +3,7 @@
Name: unrar
Version: 3.7.8
-Release: 4%{?dist}
+Release: 3%{?dist}
Summary: Utility for extracting, testing and viewing RAR archives
License: Freeware with further limitations
Group: Applications/Archiving
15 years, 5 months
rpms/unrar/F-9 unrar-3.7.8-fixes.patch,NONE,1.1 unrar.spec,1.1,1.2
by Andreas Thienemann
Author: ixs
Update of /cvs/nonfree/rpms/unrar/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9560
Modified Files:
unrar.spec
Added Files:
unrar-3.7.8-fixes.patch
Log Message:
* Sat Oct 25 2008 Andreas Thienemann <andreas(a)bawue.net> - 3.7.8-3
- Added libunrar sub-packages
- Clarified license
- Added unrar robustness patches
unrar-3.7.8-fixes.patch:
--- NEW FILE unrar-3.7.8-fixes.patch ---
diff -up unrar/dll.cpp.fix unrar/dll.cpp
--- unrar/dll.cpp.fix 2007-09-10 13:49:28.000000000 +0200
+++ unrar/dll.cpp 2008-10-25 22:41:06.000000000 +0200
@@ -275,7 +275,8 @@ int PASCAL ProcessFile(HANDLE hArcData,i
strcpy(Data->Cmd.Command,Operation==RAR_EXTRACT ? "X":"T");
Data->Cmd.Test=Operation!=RAR_EXTRACT;
bool Repeat=false;
- Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat);
+ if(Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat) == false)
+ return (ERAR_UNKNOWN);
while (Data->Arc.ReadHeader()!=0 && Data->Arc.GetHeaderType()==NEWSUB_HEAD)
{
diff -up unrar/extract.cpp.fix unrar/extract.cpp
--- unrar/extract.cpp.fix 2007-09-10 13:49:28.000000000 +0200
+++ unrar/extract.cpp 2008-10-25 22:41:06.000000000 +0200
@@ -311,6 +311,7 @@ bool CmdExtract::ExtractCurrentFile(Comm
char CurVolName[NM];
strcpy(CurVolName,ArcName);
+ if(strcmp(ArcName,"")==0) return(false);
VolNameToFirstName(ArcName,ArcName,(Arc.NewMhd.Flags & MHD_NEWNUMBERING));
if (stricomp(ArcName,CurVolName)!=0 && FileExist(ArcName))
{
diff -up unrar/makefile.unix.fix unrar/makefile.unix
--- unrar/makefile.unix.fix 2008-10-25 22:41:06.000000000 +0200
+++ unrar/makefile.unix 2008-10-25 22:42:24.000000000 +0200
@@ -86,7 +86,7 @@ COMPILE=$(CXX) $(CXXFLAGS) $(DEFINES)
LINK=$(CXX)
UNRAR_OBJ=filestr.o recvol.o rs.o scantree.o
-LIB_OBJ=filestr.o scantree.o dll.o
+LIB_OBJ=filestr.o recvol.o rs.o scantree.o dll.o
OBJECTS=rar.o strlist.o strfn.o pathfn.o int64.o savepos.o global.o file.o filefn.o filcreat.o \
archive.o arcread.o unicode.o system.o isnt.o crypt.o crc.o rawread.o encname.o \
@@ -116,4 +116,4 @@ sfx: $(OBJECTS)
lib: WHAT=RARDLL
lib: $(OBJECTS) $(LIB_OBJ)
@rm -f libunrar.so
- $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
+ $(LINK) -shared -Wl,-soname,libunrar.so.3.7 -o libunrar.so.3.7 $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
Index: unrar.spec
===================================================================
RCS file: /cvs/nonfree/rpms/unrar/F-9/unrar.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- unrar.spec 25 Jul 2008 08:10:40 -0000 1.1
+++ unrar.spec 6 Nov 2008 11:43:15 -0000 1.2
@@ -1,12 +1,16 @@
+# Might be needed to apply fuzzy patches with recent rpm
+#%%define _default_patch_fuzz 2
+
Name: unrar
Version: 3.7.8
-Release: 2%{?dist}
+Release: 4%{?dist}
Summary: Utility for extracting, testing and viewing RAR archives
-License: Freeware
+License: Freeware with further limitations
Group: Applications/Archiving
URL: http://www.rarlab.com/rar_archiver.htm
Source0: http://www.rarlab.com/rar/unrarsrc-%{version}.tar.gz
Patch0: http://ftp.debian.org/debian/pool/non-free/u/unrar-nonfree/unrar-nonfree_...
+Patch1: unrar-3.7.8-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -16,24 +20,57 @@
1.50 and above.
+%package -n libunrar
+Summary: Decompress library for RAR v3 archives
+Group: System Environment/Libraries
+
+%description -n libunrar
+The libunrar library allows programs linking against it to decompress
+existing RAR v3 archives.
+
+
+%package -n libunrar-devel
+Summary: Development files for libunrar
+Group: Development/Libraries
+Requires: libunrar = %{version}-%{release}
+Provides: libunrar3-%{version}
+
+%description -n libunrar-devel
+The libunrar-devel package contains libraries and header files for
+developing applications that use libunrar.
+
+
%prep
%setup -q -n %{name}
%patch0 -p1
+%patch1 -p1 -b .fix
%build
-make %{?_smp_mflags} -f makefile.unix \
- CXX="%{__cxx}" CXXFLAGS="$RPM_OPT_FLAGS" STRIP=:
+make %{?_smp_mflags} -f makefile.unix lib \
+ CXX="%{__cxx}" CXXFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" STRIP=: RANLIB=ranlib
+#make %{?_smp_mflags} -f makefile.unix \
+# CXX="%{__cxx}" CXXFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" STRIP=: RANLIB=ranlib
%install
-rm -rf $RPM_BUILD_ROOT
-install -Dpm 755 unrar $RPM_BUILD_ROOT%{_bindir}/unrar
-install -Dpm 644 debian/unrar.1 $RPM_BUILD_ROOT%{_mandir}/man1/unrar.1
+rm -rf %{buildroot}
+install -Dpm 755 unrar %{buildroot}%{_bindir}/unrar
+install -Dpm 644 debian/unrar.1 %{buildroot}%{_mandir}/man1/unrar.1
+install -Dpm 755 libunrar.so.3.7 %{buildroot}%{_libdir}/libunrar.so.3.7
+install -Dpm 644 dll.hpp %{buildroot}/%{_includedir}/unrar/dll.hpp
+ln -s libunrar.so.3.7 %{buildroot}%{_libdir}/libunrar.so.3
+ln -s libunrar.so.3 %{buildroot}%{_libdir}/libunrar.so
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
+
+%post -n libunrar -p /sbin/ldconfig
+
+
+%postun -n libunrar -p /sbin/ldconfig
%files
@@ -42,8 +79,24 @@
%{_bindir}/unrar
%{_mandir}/man1/unrar.1*
+%files -n libunrar
+%defattr(-,root,root,-)
+%doc license.txt readme.txt
+%{_libdir}/*.so.*
+
+%files -n libunrar-devel
+%defattr(-,root,root,-)
+%doc license.txt readme.txt
+%{_includedir}/*
+%{_libdir}/*.so
+
%changelog
+* Sat Oct 25 2008 Andreas Thienemann <andreas(a)bawue.net> - 3.7.8-3
+- Added libunrar sub-packages
+- Clarified license
+- Added unrar robustness patches
+
* Thu Jul 24 2008 Conrad Meyer <konrad(a)tylerc.org> - 3.7.8-2
- Import into RPM Fusion.
15 years, 5 months
rpms/slmodem-kmod/F-9 slmodem-kmod.spec,1.2,1.3
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/slmodem-kmod/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8370
Modified Files:
slmodem-kmod.spec
Log Message:
* Thu Nov 06 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.9.11-26.3
- rebuild for latest Fedora kernel;
Index: slmodem-kmod.spec
===================================================================
RCS file: /cvs/nonfree/rpms/slmodem-kmod/F-9/slmodem-kmod.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- slmodem-kmod.spec 23 Oct 2008 19:29:05 -0000 1.2
+++ slmodem-kmod.spec 6 Nov 2008 11:25:12 -0000 1.3
@@ -12,7 +12,7 @@
Name: slmodem-kmod
Version: 2.9.11
-Release: 26%{?dist}.2
+Release: 26%{?dist}.3
Summary: Proprietary SmartLink softmodem kernel drivers
Group: System Environment/Kernel
@@ -102,6 +102,9 @@
%changelog
+* Thu Nov 06 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.9.11-26.3
+- rebuild for latest Fedora kernel;
+
* Thu Oct 23 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.9.11-26.2
- rebuild for latest kernel
15 years, 5 months