rpms/qpxtool/devel consolehelper.patch, NONE, 1.1 libatafix.patch, NONE, 1.1 manpagefix.patch, NONE, 1.1 qpxtool-0.6.1-buildfix.patch, NONE, 1.1 qpxtool.desktop, NONE, 1.1 qpxtool.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Adel Gadllah (drago01) fedora-extras-commits at redhat.com
Mon Sep 24 16:39:10 UTC 2007


Author: drago01

Update of /cvs/pkgs/rpms/qpxtool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31452/devel

Modified Files:
	.cvsignore sources 
Added Files:
	consolehelper.patch libatafix.patch manpagefix.patch 
	qpxtool-0.6.1-buildfix.patch qpxtool.desktop qpxtool.spec 
Log Message:

Initial Import-


consolehelper.patch:

--- NEW FILE consolehelper.patch ---
diff -upNr qpxtool-0.6.1.orign/console/pioquiet/Makefile qpxtool-0.6.1/console/pioquiet/Makefile
--- qpxtool-0.6.1.orign/console/pioquiet/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/console/pioquiet/Makefile	2007-09-08 12:49:42.000000000 +0200
@@ -16,7 +16,7 @@ clean:
 
 install:
 	mkdir -p $(DESTDIR)$(BINDIR)
-	install -m 4755 $(BIN) $(DESTDIR)$(BINDIR)
+	install -m 755 $(BIN) $(DESTDIR)$(BINDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/$(BIN)
diff -upNr qpxtool-0.6.1.orign/console/pxcontrol/Makefile qpxtool-0.6.1/console/pxcontrol/Makefile
--- qpxtool-0.6.1.orign/console/pxcontrol/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/console/pxcontrol/Makefile	2007-09-08 12:50:00.000000000 +0200
@@ -16,7 +16,7 @@ clean:
 
 install:
 	mkdir -p $(DESTDIR)$(BINDIR)
-	install -m 4755 $(BIN) $(DESTDIR)$(BINDIR)
+	install -m 755 $(BIN) $(DESTDIR)$(BINDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/$(BIN)
diff -upNr qpxtool-0.6.1.orign/console/pxfw/Makefile qpxtool-0.6.1/console/pxfw/Makefile
--- qpxtool-0.6.1.orign/console/pxfw/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/console/pxfw/Makefile	2007-09-08 12:50:15.000000000 +0200
@@ -16,7 +16,7 @@ clean:
 
 install:
 	mkdir -p $(DESTDIR)$(BINDIR)
-	install -m 4755 $(BIN) $(DESTDIR)$(BINDIR)
+	install -m 755 $(BIN) $(DESTDIR)$(BINDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/$(BIN)
diff -upNr qpxtool-0.6.1.orign/consolehelper/console.app/qpxtool qpxtool-0.6.1/consolehelper/console.app/qpxtool
--- qpxtool-0.6.1.orign/consolehelper/console.app/qpxtool	1970-01-01 01:00:00.000000000 +0100
+++ qpxtool-0.6.1/consolehelper/console.app/qpxtool	2007-09-08 12:49:04.000000000 +0200
@@ -0,0 +1,4 @@
+USER=root
+PROGRAM=/usr/sbin/qpxtool
+SESSION=true
+
diff -upNr qpxtool-0.6.1.orign/consolehelper/pam.d/qpxtool qpxtool-0.6.1/consolehelper/pam.d/qpxtool
--- qpxtool-0.6.1.orign/consolehelper/pam.d/qpxtool	1970-01-01 01:00:00.000000000 +0100
+++ qpxtool-0.6.1/consolehelper/pam.d/qpxtool	2007-09-08 12:49:04.000000000 +0200
@@ -0,0 +1,4 @@
+#%PAM-1.0
+auth		include		config-util
+account		include		config-util
+session		include		config-util
diff -upNr qpxtool-0.6.1.orign/qpxtool-gui/Makefile qpxtool-0.6.1/qpxtool-gui/Makefile
--- qpxtool-0.6.1.orign/qpxtool-gui/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/qpxtool-gui/Makefile	2007-09-08 12:53:00.000000000 +0200
@@ -18,7 +18,7 @@ qproject:
 	LIBPATH+="../lib/lib"
 
 install: Makefile.qmake
-	install -m 4755 qpxtool $(DESTDIR)$(BINDIR)
+	install -m 755 qpxtool $(DESTDIR)$(BINDIR)
 
 uninstall:
 	rm -f $(DESTDIR)$(BINDIR)/qpxtool

libatafix.patch:

--- NEW FILE libatafix.patch ---
diff -upNr qpxtool-0.6.1.orign/lib/include/qpx_mmc.h qpxtool-0.6.1/lib/include/qpx_mmc.h
--- qpxtool-0.6.1.orign/lib/include/qpx_mmc.h	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/lib/include/qpx_mmc.h	2007-09-08 11:34:44.000000000 +0200
@@ -372,15 +372,15 @@ const	str_dev _devtbl[_devcnt]={
 		"/dev/hdu\0", "/dev/hdv\0", "/dev/hdw\0", "/dev/hdx\0",
 		"/dev/hdy\0", "/dev/hdz\0",
 
-		"/dev/sr0\0", "/dev/sr1\0", "/dev/sr2\0", "/dev/sr3\0",
-		"/dev/sr4\0", "/dev/sr5\0", "/dev/sr6\0", "/dev/sr7\0",
-		"/dev/sr8\0", "/dev/sr9\0", "/dev/sr10\0","/dev/sr11\0",
-		"/dev/sr12\0","/dev/sr13\0","/dev/sr14\0","/dev/sr15\0",
-
-		"/dev/sr16\0","/dev/sr17\0","/dev/sr18\0","/dev/sr19\0",
-		"/dev/sr20\0","/dev/sr21\0","/dev/sr22\0","/dev/sr23\0",
-		"/dev/sr24\0","/dev/sr25\0","/dev/sr26\0","/dev/sr27\0",
-		"/dev/sr28\0","/dev/sr29\0","/dev/sr30\0","/dev/sr31\0"
+		"/dev/scd0\0", "/dev/scd1\0", "/dev/scd2\0", "/dev/scd3\0",
+		"/dev/scd4\0", "/dev/scd5\0", "/dev/scd6\0", "/dev/scd7\0",
+		"/dev/scd8\0", "/dev/scd9\0", "/dev/scd10\0","/dev/scd11\0",
+		"/dev/scd12\0","/dev/scd13\0","/dev/scd14\0","/dev/scd15\0",
+
+		"/dev/scd16\0","/dev/scd17\0","/dev/scd18\0","/dev/scd19\0",
+		"/dev/scd20\0","/dev/scd21\0","/dev/scd22\0","/dev/scd23\0",
+		"/dev/scd24\0","/dev/scd25\0","/dev/scd26\0","/dev/scd27\0",
+		"/dev/scd28\0","/dev/scd29\0","/dev/scd30\0","/dev/scd31\0"
 };
 
 #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
diff -upNr qpxtool-0.6.1.orign/lib/qpxtransport/include/qpx_mmc.h qpxtool-0.6.1/lib/qpxtransport/include/qpx_mmc.h
--- qpxtool-0.6.1.orign/lib/qpxtransport/include/qpx_mmc.h	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/lib/qpxtransport/include/qpx_mmc.h	2007-09-08 11:34:44.000000000 +0200
@@ -372,15 +372,15 @@ const	str_dev _devtbl[_devcnt]={
 		"/dev/hdu\0", "/dev/hdv\0", "/dev/hdw\0", "/dev/hdx\0",
 		"/dev/hdy\0", "/dev/hdz\0",
 
-		"/dev/sr0\0", "/dev/sr1\0", "/dev/sr2\0", "/dev/sr3\0",
-		"/dev/sr4\0", "/dev/sr5\0", "/dev/sr6\0", "/dev/sr7\0",
-		"/dev/sr8\0", "/dev/sr9\0", "/dev/sr10\0","/dev/sr11\0",
-		"/dev/sr12\0","/dev/sr13\0","/dev/sr14\0","/dev/sr15\0",
-
-		"/dev/sr16\0","/dev/sr17\0","/dev/sr18\0","/dev/sr19\0",
-		"/dev/sr20\0","/dev/sr21\0","/dev/sr22\0","/dev/sr23\0",
-		"/dev/sr24\0","/dev/sr25\0","/dev/sr26\0","/dev/sr27\0",
-		"/dev/sr28\0","/dev/sr29\0","/dev/sr30\0","/dev/sr31\0"
+		"/dev/scd0\0", "/dev/scd1\0", "/dev/scd2\0", "/dev/scd3\0",
+		"/dev/scd4\0", "/dev/scd5\0", "/dev/scd6\0", "/dev/scd7\0",
+		"/dev/scd8\0", "/dev/scd9\0", "/dev/scd10\0","/dev/scd11\0",
+		"/dev/scd12\0","/dev/scd13\0","/dev/scd14\0","/dev/scd15\0",
+
+		"/dev/scd16\0","/dev/scd17\0","/dev/scd18\0","/dev/scd19\0",
+		"/dev/scd20\0","/dev/scd21\0","/dev/scd22\0","/dev/scd23\0",
+		"/dev/scd24\0","/dev/scd25\0","/dev/scd26\0","/dev/scd27\0",
+		"/dev/scd28\0","/dev/scd29\0","/dev/scd30\0","/dev/scd31\0"
 };
 
 #elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__)

manpagefix.patch:

--- NEW FILE manpagefix.patch ---
diff -upNr qpxtool-0.6.1.orign/man/Makefile qpxtool-0.6.1/man/Makefile
--- qpxtool-0.6.1.orign/man/Makefile	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/man/Makefile	2007-09-09 09:10:36.000000000 +0200
@@ -7,7 +7,7 @@ clean:
 
 install:
 	mkdir -p $(DESTDIR)$(MAN8DIR)
-	for m in $(MANS8); do install -m 0644 $$m $(DESTDIR)$(MAN8DIR) ; done
+	for m in $(MANS8); do install -p -m 0644 $$m $(DESTDIR)$(MAN8DIR) ; done
 
 uninstall:
 	for m in $(MANS8); do rm -f $(DESTDIR)$(LIBDIR)/$$m ; done

qpxtool-0.6.1-buildfix.patch:

--- NEW FILE qpxtool-0.6.1-buildfix.patch ---
diff -upNr qpxtool-0.6.1.orign/lib/qpxtransport/qpx_transport.cpp qpxtool-0.6.1/lib/qpxtransport/qpx_transport.cpp
--- qpxtool-0.6.1.orign/lib/qpxtransport/qpx_transport.cpp	2007-08-19 16:04:14.000000000 +0200
+++ qpxtool-0.6.1/lib/qpxtransport/qpx_transport.cpp	2007-09-22 10:46:23.000000000 +0200
@@ -23,6 +23,7 @@ int sense2str(int err, char* str);
 #include <fcntl.h>
 #include <poll.h>
 #include <sys/time.h>
+#include <limits.h>
 
 #include "qpx_transport.h"
 


--- NEW FILE qpxtool.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=QPxTool
GenericName=CD/DVD Quality Tool
Comment=Check CD/DVD Media Quality
Exec=qpxtool
Icon=qpxtool
Terminal=false
Type=Application
Categories=System;


--- NEW FILE qpxtool.spec ---
Name: qpxtool
Version: 0.6.1        
Release: 5%{?dist}
Summary: CD/DVD Quality check tool

Group: Applications/System         
License: GPLv2+       
URL: http://qpxtool.sourceforge.net           
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2  
Source1: %{name}.desktop
Patch0: libatafix.patch
Patch1: consolehelper.patch
Patch2: manpagefix.patch
Patch3: qpxtool-0.6.1-buildfix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: qt-devel
BuildRequires: desktop-file-utils
BuildRequires: sed
Requires: usermode >= 1.36       

%description
QPxTool is the linux way to get full control over your CD/DVD drives.
It is the Open Source Solution which intends to give you access to all
available Quality Checks (Q-Checks) on written and blank media, that
are available for your drive. This will help you to find the right media
and the optimized writing speed for your hardware, which will increase
the chance for a long data lifetime.

%package devel
Summary: Qpxtool headers and Libraries
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
Headerfiles and libraries for developing apps using the
qpx* libs.

%prep
%setup -q
%patch0 -p1
%patch1 -p1 -b .consolehelper
%patch2 -p1 -b .manpagefix
%patch3 -p1 -b .buildfix

sed -ie 's!/usr/local!%{_prefix}!g' Makefile 
sed -ie 's!\$(PREFIX)/bin!%{_sbindir}!g' Makefile
sed -ie 's!\$(PREFIX)/lib!%{_libdir}!g' Makefile
sed -ie 's!\$(PREFIX)/man!%{_mandir}!g' Makefile
sed -ie 's!\$(PREFIX)/include!%{_includedir}!g' Makefile

%build
export CFLAGS=$RPM_OPT_FLAGS
export CXXFLAGS=$RPM_OPT_FLAGS
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
mkdir -p $RPM_BUILD_ROOT%{_bindir}

cp -p consolehelper/console.app/qpxtool $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/
cp -p consolehelper/pam.d/qpxtool $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/
ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/qpxtool
cp -p qpxtool-gui/img/q.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps/qpxtool.xpm

desktop-file-install --vendor="fedora"               \
  --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
  %{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%{_bindir}/qpxtool
%{_sbindir}/qpxtool
%{_sbindir}/deadreader
%{_sbindir}/pioquiet
%{_sbindir}/pxcontrol
%{_sbindir}/pxfw
%{_libdir}/libqpxpioneer.so.0
%{_libdir}/libqpxpioneer.so.0.6.0
%{_libdir}/libqpxplextor.so.0
%{_libdir}/libqpxplextor.so.0.6.1
%{_libdir}/libqpxscan.so.0
%{_libdir}/libqpxscan.so.0.6.1
%{_libdir}/libqpxtransport.so.0
%{_libdir}/libqpxtransport.so.0.6.3
%{_mandir}/man8/pxcontrol.8.*
%{_mandir}/man8/pxfw.8.*
%{_datadir}/pixmaps/qpxtool.xpm
%{_datadir}/applications/fedora-qpxtool.desktop
%config(noreplace) %{_sysconfdir}/pam.d/qpxtool
%config(noreplace) %{_sysconfdir}/security/console.apps/qpxtool
%doc COPYING AUTHORS README ChangeLog

%files devel
%defattr(-,root,root,-)
%{_includedir}/*.h
%{_libdir}/libqpxpioneer.so
%{_libdir}/libqpxplextor.so
%{_libdir}/libqpxscan.so
%{_libdir}/libqpxtransport.so

%changelog
* Sat Sep 22 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-5
- Fix desktop file category

* Sat Sep 22 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-4
- Clean up desktop file
- Fix Source0 URL

* Sat Sep 22 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-3
- Fix build failure

* Sun Sep 09 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-2
- Spec file cleanups
- Preserve manpage timestamps

* Sat Sep 08 2007 Adel Gadllah <adel.gadllah at gmail.com> 0.6.1-1
- Inital build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qpxtool/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Sep 2007 16:28:53 -0000	1.1
+++ .cvsignore	24 Sep 2007 16:38:38 -0000	1.2
@@ -0,0 +1 @@
+qpxtool-0.6.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qpxtool/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Sep 2007 16:28:53 -0000	1.1
+++ sources	24 Sep 2007 16:38:38 -0000	1.2
@@ -0,0 +1 @@
+4fa7ce8aa9c13aa2db0a8b5224acb906  qpxtool-0.6.1.tar.bz2




More information about the fedora-extras-commits mailing list