commit df4fb470ce11662dd4dc21b7a068f6e3e794612d
Author: Jakub Bogusz <[email protected]>
Date: Sun Feb 5 16:40:59 2023 +0100
- updated to 2.8.2
- added optflags patch
webCDwriter-optflags.patch | 20 +++++++++++++++++
webCDwriter.spec | 55 +++++++++++++++++++++++++---------------------
2 files changed, 50 insertions(+), 25 deletions(-)
---
diff --git a/webCDwriter.spec b/webCDwriter.spec
index e7c3ebc..80a623d 100644
--- a/webCDwriter.spec
+++ b/webCDwriter.spec
@@ -8,14 +8,15 @@
Summary: Network CD Writing tool
Summary(pl.UTF-8): Narzędzie do sieciowego nagrywania CD
Name: webCDwriter
-Version: 2.8.1
-Release: 3
+Version: 2.8.2
+Release: 1
License: GPL v2+
Group: Networking/Daemons
+#Source0Download: http://joerghaeger.de/webCDwriter/TARs.html
Source0:
http://joerghaeger.de/webCDwriter/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 7cf04f31507a1da96073eef2d50b65b0
+# Source0-md5: 5f353258319f2bfcc076ac327e259ad2
Patch0: %{name}-FHS.patch
-# Source0Download: http://joerghaeger.de/webCDwriter/TARs.html
+Patch1: %{name}-optflags.patch
URL: http://JoergHaeger.de/webCDwriter/
BuildRequires: autoconf
BuildRequires: automake
@@ -80,30 +81,35 @@ Zdalny klient dla webCDwritera.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
-
-./configure --pam \
- --group=%{CDWgroup} \
- --user=%{CDWuser} \
- --port=12411 \
- --destDir=$RPM_BUILD_ROOT \
- --doNotCompileWebCDcreator
-
-# --nosCert= # Netscape Object Signing Certificate
-# --sunCert= # certificate for the keytool from Sun
-# --debug
-
-%{__make}
+./configure \
+ --pam \
+ --group=%{CDWgroup} \
+ --user=%{CDWuser} \
+ --port=12411 \
+ --destDir=$RPM_BUILD_ROOT \
+ --doNotCompileWebCDcreator
+
+# --nosCert= # Netscape Object Signing Certificate
+# --sunCert= # certificate for the keytool from Sun
+# --debug
+
+%{__make} \
+ CXX="%{__cxx}" \
+ CXXFLAGS="%{rpmcxxflags} %{rpmcppflags}" \
+ LDFLAGS="%{rpmldflags} %{rpmcxxflags}"
%install
rm -rf $RPM_BUILD_ROOT
+
# looks like make install auto users $RPM_BUILD_ROOT?
%{__make} install
install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,%{_datadir}/CDWserver}
-mv $RPM_BUILD_ROOT/etc/init.d/CDWserver
$RPM_BUILD_ROOT/etc/rc.d/init.d/CDWserver
-rm $RPM_BUILD_ROOT%{_bindir}/CDWuninstall.sh
+%{__mv} $RPM_BUILD_ROOT/etc/init.d/CDWserver
$RPM_BUILD_ROOT/etc/rc.d/init.d/CDWserver
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/CDWuninstall.sh
%clean
if [ ! -e $RPM_BUILD_ROOT/dev/ ]; then
@@ -201,12 +207,11 @@ fi
%dir %attr(700,%{CDWuser},%{CDWgroup}) %{_var}/log/CDWserver
%dir %attr(700,%{CDWuser},%{CDWgroup}) %{_var}/spool/CDWserver
%dir %{_datadir}/CDWserver
-%attr(4754, root, %{CDWgroup}) %{_bindir}/cdrecord-dummy
-%attr(4754, root, %{CDWgroup}) %{_bindir}/cdrdao-dummy
-%attr(4754, root, %{CDWgroup}) %{_bindir}/CDWrootGate
-%attr(4754, root, %{CDWgroup}) %{_bindir}/CDWverify
-%attr(4754, root, %{CDWgroup}) %{_bindir}/CDWverify-dummy
-#%attr(4754, root, %{CDWgroup}) %{_bindir}/setScheduler
+%attr(4754,root,%{CDWgroup}) %{_bindir}/cdrecord-dummy
+%attr(4754,root,%{CDWgroup}) %{_bindir}/cdrdao-dummy
+%attr(4754,root,%{CDWgroup}) %{_bindir}/CDWrootGate
+%attr(4754,root,%{CDWgroup}) %{_bindir}/CDWverify
+%attr(4754,root,%{CDWgroup}) %{_bindir}/CDWverify-dummy
%attr(755,root,root) %{_bindir}/dvd+rw-format-dummy
%attr(755,root,root) %{_bindir}/growisofs-dummy
diff --git a/webCDwriter-optflags.patch b/webCDwriter-optflags.patch
new file mode 100644
index 0000000..a8b8569
--- /dev/null
+++ b/webCDwriter-optflags.patch
@@ -0,0 +1,20 @@
+--- webCDwriter-2.8.2/rcdrecord/Makefile.orig 2004-05-01 20:43:56.000000000
+0200
++++ webCDwriter-2.8.2/rcdrecord/Makefile 2023-02-05 16:36:48.043955563
+0100
+@@ -13,14 +13,14 @@ goal: rcdrecord
+ include config
+
+ %.o: %.cpp %.h config.h Error.h Version.h
+- $(CXX) -c $<
++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c $<
+
+ rcdrecord.o: CommandArgs.h Client.h Client2.h Error.h \
+ Version.h rcdrecord.cpp
+- $(CXX) -c rcdrecord.cpp
++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c rcdrecord.cpp
+
+ rcdrecord: Client.o Client2.o rcdrecord.o
+- $(CXX) Client.o Client2.o rcdrecord.o -o rcdrecord
++ $(CXX) $(LDFLAGS) $(CXXFLAGS) Client.o Client2.o rcdrecord.o -o
rcdrecord
+ ln -sf rcdrecord files2cd
+ ln -sf rcdrecord image2cd
+ @echo
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/webCDwriter.git/commitdiff/df4fb470ce11662dd4dc21b7a068f6e3e794612d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
