SPECS (DEVEL): cups.spec - man_pages_linking.patch now works - comment none...
lisu
lisu at pld-linux.org
Wed Dec 17 15:31:42 CET 2008
Author: lisu Date: Wed Dec 17 14:31:42 2008 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- man_pages_linking.patch now works
- comment nonexistent files in %%files section
- java not supported any more?
- still doesn't build with dnssd
---- Files affected:
SPECS:
cups.spec (1.247.2.2 -> 1.247.2.3)
---- Diffs:
================================================================
Index: SPECS/cups.spec
diff -u SPECS/cups.spec:1.247.2.2 SPECS/cups.spec:1.247.2.3
--- SPECS/cups.spec:1.247.2.2 Wed Dec 17 13:55:18 2008
+++ SPECS/cups.spec Wed Dec 17 15:31:37 2008
@@ -1,9 +1,8 @@
# $Revision$, $Date$
#
-# TODO: - update cups-man_pages_linking.patch
-# - make it build with dnssd
-# - fix install section
-# - fix problem with java files
+# TODO: - make it build with dnssd
+# - check files section
+# - fix problem with java files (IMO no longer supported)
#
# Conditional build:
%bcond_with gnutls # use GNU TLS for SSL/TLS support (instead of OpenSSL)
@@ -342,7 +341,7 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
-#%%patch3 -p1
+%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
@@ -400,14 +399,14 @@
cd ../..
%endif
-%if %{with java}
-cd scripting/java
-rm -rf classes/* cups.jar
-%javac -d classes src/com/easysw/cups/*.java
-cd classes
-%jar cvf ../cups.jar com/easysw/cups
-cd ../../..
-%endif
+#%%if %{with java}
+#cd scripting/java
+#rm -rf classes/* cups.jar
+#%%javac -d classes src/com/easysw/cups/*.java
+#cd classes
+#%%jar cvf ../cups.jar com/easysw/cups
+#cd ../../..
+#%%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -441,18 +440,18 @@
DESTDIR=$RPM_BUILD_ROOT
%endif
-%if %{with java}
-install -d $RPM_BUILD_ROOT{%{_datadir}/java,%{_examplesdir}/java-cups-%{version}}
+#%%if %{with java}
+#install -d $RPM_BUILD_ROOT{%{_datadir}/java,%{_examplesdir}/java-cups-%{version}}
# jars
-cp -a scripting/java/cups.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
+#cp -a scripting/java/cups.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+#ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
# examples
-cp -a scripting/java/{CUPSPrinter.java,example} $RPM_BUILD_ROOT%{_examplesdir}/java-cups-%{version}
+#cp -a scripting/java/{CUPSPrinter.java,example} $RPM_BUILD_ROOT%{_examplesdir}/java-cups-%{version}
# javadoc
-install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -a scripting/java/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
-%endif
+#install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+#cp -a scripting/java/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+#ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
+#%%endif
install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/%{name}
@@ -460,7 +459,7 @@
install %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/cups/mailto.conf
sed -e 's|__ULIBDIR__|%{_ulibdir}|g' %{SOURCE5} > $RPM_BUILD_ROOT/etc/sysconfig/rc-inetd/cups-lpd
-gzip -9nf $RPM_BUILD_ROOT%{_datadir}/%{name}/model/*.ppd
+#gzip -9nf $RPM_BUILD_ROOT%{_datadir}/%{name}/model/*.ppd
touch $RPM_BUILD_ROOT/var/log/cups/{access_log,error_log,page_log}
touch $RPM_BUILD_ROOT/etc/security/blacklist.cups
@@ -482,9 +481,9 @@
ln -s accept $RPM_BUILD_ROOT%{_sbindir}/disable
# fix/update locale names
-install -d $RPM_BUILD_ROOT%{_datadir}/locale/{nb,zh_CN}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{no/cups_no.po,nb/cups_nb.po}
-mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{zh/cups_zh.po,zh_CN/cups_zh_CN.po}
+#install -d $RPM_BUILD_ROOT%{_datadir}/locale/{nb,zh_CN}
+#mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{no/cups_no.po,nb/cups_nb.po}
+#mv -f $RPM_BUILD_ROOT%{_datadir}/locale/{zh/cups_zh.po,zh_CN/cups_zh_CN.po}
# check-files cleanup
rm -rf $RPM_BUILD_ROOT%{_mandir}/{,es/,fr/}cat?
@@ -540,8 +539,8 @@
%attr(600,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/printers.conf
%attr(600,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/mailto.conf
%attr(600,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/snmp.conf
-%attr(640,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.convs
-%attr(640,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.types
+#%%attr(640,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.convs
+#%%attr(640,root,lp) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}/*.types
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.cups
%dir %attr(700,root,lp) %{_sysconfdir}/%{name}/ssl
%dir %{_sysconfdir}/%{name}/interfaces
@@ -561,19 +560,19 @@
%attr(755,root,root) %{_ulibdir}/cups/cgi-bin/*.cgi
%{_ulibdir}/cups/cgi-bin/*.css
%{_ulibdir}/cups/cgi-bin/*.html
-%{_ulibdir}/cups/cgi-bin/*.ico
%{_ulibdir}/cups/cgi-bin/*.txt
-%lang(de) %{_ulibdir}/cups/cgi-bin/de
-%lang(es) %{_ulibdir}/cups/cgi-bin/es
-%lang(et) %{_ulibdir}/cups/cgi-bin/et
-%lang(fr) %{_ulibdir}/cups/cgi-bin/fr
-%lang(he) %{_ulibdir}/cups/cgi-bin/he
-%lang(id) %{_ulibdir}/cups/cgi-bin/id
-%lang(it) %{_ulibdir}/cups/cgi-bin/it
-%lang(ja) %{_ulibdir}/cups/cgi-bin/ja
-%lang(pl) %{_ulibdir}/cups/cgi-bin/pl
-%lang(sv) %{_ulibdir}/cups/cgi-bin/sv
-%lang(zh_TW) %{_ulibdir}/cups/cgi-bin/zh_TW
+%{_ulibdir}/cups/cgi-bin/*.png
+#%%lang(de) %{_ulibdir}/cups/cgi-bin/de
+#%%lang(es) %{_ulibdir}/cups/cgi-bin/es
+#%%lang(et) %{_ulibdir}/cups/cgi-bin/et
+#%%lang(fr) %{_ulibdir}/cups/cgi-bin/fr
+#%%lang(he) %{_ulibdir}/cups/cgi-bin/he
+#%%lang(id) %{_ulibdir}/cups/cgi-bin/id
+#%%lang(it) %{_ulibdir}/cups/cgi-bin/it
+#%%lang(ja) %{_ulibdir}/cups/cgi-bin/ja
+#%%lang(pl) %{_ulibdir}/cups/cgi-bin/pl
+#%%lang(sv) %{_ulibdir}/cups/cgi-bin/sv
+#%%lang(zh_TW) %{_ulibdir}/cups/cgi-bin/zh_TW
%exclude %{_ulibdir}/cups/backend/usb
%exclude %{_ulibdir}/cups/backend/serial
@@ -592,7 +591,7 @@
%{_datadir}/cups/drivers
%{_datadir}/cups/fonts
%dir %{_datadir}/cups/model
-%{_datadir}/cups/model/*.ppd.gz
+#%%{_datadir}/cups/model/*.ppd.gz
# dirs for gimp-print-cups-4.2.7-1
%dir %{_datadir}/cups/model/C
%lang(da) %dir %{_datadir}/cups/model/da
@@ -604,27 +603,27 @@
%dir %{_datadir}/cups/templates
%{_datadir}/cups/templates/*.tmpl
-%lang(de) %{_datadir}/cups/templates/de
+#%%lang(de) %{_datadir}/cups/templates/de
%lang(es) %{_datadir}/cups/templates/es
-%lang(et) %{_datadir}/cups/templates/et
-%lang(fr) %{_datadir}/cups/templates/fr
-%lang(he) %{_datadir}/cups/templates/he
-%lang(id) %{_datadir}/cups/templates/id
-%lang(it) %{_datadir}/cups/templates/it
-%lang(ja) %{_datadir}/cups/templates/ja
-%lang(pl) %{_datadir}/cups/templates/pl
-%lang(sv) %{_datadir}/cups/templates/sv
-%lang(zh_TW) %{_datadir}/cups/templates/zh_TW
+#%%lang(et) %{_datadir}/cups/templates/et
+#%%lang(fr) %{_datadir}/cups/templates/fr
+#%%lang(he) %{_datadir}/cups/templates/he
+#%%lang(id) %{_datadir}/cups/templates/id
+#%%lang(it) %{_datadir}/cups/templates/it
+#%%lang(ja) %{_datadir}/cups/templates/ja
+#%%lang(pl) %{_datadir}/cups/templates/pl
+#%%lang(sv) %{_datadir}/cups/templates/sv
+#%%lang(zh_TW) %{_datadir}/cups/templates/zh_TW
%{_mandir}/man1/cupstestppd.1*
%{_mandir}/man1/cupstestdsc.1*
%{_mandir}/man1/lppasswd.1*
%{_mandir}/man7/backend.7*
%{_mandir}/man7/filter.7*
%{_mandir}/man5/*
-%{_mandir}/man8/accept.8*
%{_mandir}/man8/cups-deviced.8*
%{_mandir}/man8/cups-driverd.8*
%{_mandir}/man8/cups-polld.8*
+%{_mandir}/man8/cupsaccept.8*
%{_mandir}/man8/cupsaddsmb.8*
%{_mandir}/man8/cupsctl.8*
%{_mandir}/man8/cupsd.8*
@@ -654,26 +653,26 @@
%attr(755,root,root) %{_libdir}/libcups.so.*
%dir %{_datadir}/cups
%{_datadir}/cups/charmaps
-%lang(da) %{_datadir}/locale/da/cups_da.po
-%lang(de) %{_datadir}/locale/de/cups_de.po
-%lang(es) %{_datadir}/locale/es/cups_es.po
-%lang(et) %{_datadir}/locale/et/cups_et.po
-%lang(fi) %{_datadir}/locale/fi/cups_fi.po
-%lang(fr) %{_datadir}/locale/fr/cups_fr.po
-%lang(he) %{_datadir}/locale/he/cups_he.po
-%lang(id) %{_datadir}/locale/id/cups_id.po
-%lang(it) %{_datadir}/locale/it/cups_it.po
-%lang(ko) %{_datadir}/locale/ko/cups_ko.po
-%lang(ja) %{_datadir}/locale/ja/cups_ja.po
-%lang(nl) %{_datadir}/locale/nl/cups_nl.po
-%lang(nb) %{_datadir}/locale/nb/cups_nb.po
-%lang(pl) %{_datadir}/locale/pl/cups_pl.po
-%lang(pt) %{_datadir}/locale/pt/cups_pt.po
-%lang(pt_BR) %{_datadir}/locale/pt_BR/cups_pt_BR.po
-%lang(ru) %{_datadir}/locale/ru/cups_ru.po
-%lang(sv) %{_datadir}/locale/sv/cups_sv.po
-%lang(zh_CN) %{_datadir}/locale/zh_CN/cups_zh_CN.po
-%lang(zh_TW) %{_datadir}/locale/zh_TW/cups_zh_TW.po
+#%%lang(da) %{_datadir}/locale/da/cups_da.po
+#%%lang(de) %{_datadir}/locale/de/cups_de.po
+#%%lang(es) %{_datadir}/locale/es/cups_es.po
+#%%lang(et) %{_datadir}/locale/et/cups_et.po
+#%%lang(fi) %{_datadir}/locale/fi/cups_fi.po
+#%%lang(fr) %{_datadir}/locale/fr/cups_fr.po
+#%%lang(he) %{_datadir}/locale/he/cups_he.po
+#%%lang(id) %{_datadir}/locale/id/cups_id.po
+#%%lang(it) %{_datadir}/locale/it/cups_it.po
+#%%lang(ko) %{_datadir}/locale/ko/cups_ko.po
+#%%lang(ja) %{_datadir}/locale/ja/cups_ja.po
+#%%lang(nl) %{_datadir}/locale/nl/cups_nl.po
+#%%lang(nb) %{_datadir}/locale/nb/cups_nb.po
+#%%lang(pl) %{_datadir}/locale/pl/cups_pl.po
+#%%lang(pt) %{_datadir}/locale/pt/cups_pt.po
+#%%lang(pt_BR) %{_datadir}/locale/pt_BR/cups_pt_BR.po
+#%%lang(ru) %{_datadir}/locale/ru/cups_ru.po
+#%%lang(sv) %{_datadir}/locale/sv/cups_sv.po
+#%%lang(zh_CN) %{_datadir}/locale/zh_CN/cups_zh_CN.po
+#%%lang(zh_TW) %{_datadir}/locale/zh_TW/cups_zh_TW.po
%files clients
%defattr(644,root,root,755)
@@ -759,17 +758,17 @@
%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/phpcups.ini
%endif
-%if %{with java}
-%files -n java-cups
-%defattr(644,root,root,755)
-%{_javadir}/*.jar
-%{_examplesdir}/java-cups-%{version}
-
-%files -n java-cups-javadoc
-%defattr(644,root,root,755)
-%{_javadocdir}/%{name}-%{version}
-%ghost %{_javadocdir}/%{name}
-%endif
+#%%if %{with java}
+#%%files -n java-cups
+#%%defattr(644,root,root,755)
+#%%{_javadir}/*.jar
+#%%{_examplesdir}/java-cups-%{version}
+
+#%%files -n java-cups-javadoc
+#%%defattr(644,root,root,755)
+#%%{_javadocdir}/%{name}-%{version}
+#%%ghost %{_javadocdir}/%{name}
+#%%endif
%files backend-usb
%defattr(644,root,root,755)
@@ -795,6 +794,12 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.247.2.3 2008/12/17 14:31:37 lisu
+- man_pages_linking.patch now works
+- comment nonexistent files in %%files section
+- java not supported any more?
+- still doesn't build with dnssd
+
Revision 1.247.2.2 2008/12/17 12:55:18 lisu
- add CVE-2008-5286 reference to previous commit log
- BR: security(CVE-2008-5286) removed
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/cups.spec?r1=1.247.2.2&r2=1.247.2.3&f=u
More information about the pld-cvs-commit
mailing list