Re: [MOD] STR #4145: 1.6.0 won't build RPM on CentOS 5.8
Michael Sweet <[email protected]>
| Newsgroups | gmane.comp.printing.cups.bugs |
|---|---|
| Message-ID | <[email protected]> |
DO NOT REPLY TO THIS MESSAGE. INSTEAD, POST ANY RESPONSES TO THE LINK BELOW. [STR Closed w/Resolution] Fixed in Subversion repository. Took a little while to see what was wrong, conditional rpm stuff is a bit esoteric... Link: http://www.cups.org/str.php?L4145 Version: 1.6.0 Fix Version: 1.6-current (r10558) _______________________________________________ cups-bugs mailing list [email protected] http://lists.easysw.com/mailman/listinfo/cups-bugs
str4145.patch
(text/plain, 1.9 KB)
Index: backend/Makefile
===================================================================
--- backend/Makefile (revision 10553)
+++ backend/Makefile (working copy)
@@ -128,7 +128,7 @@
$(RM) $(SERVERBIN)/backend/$$file; \
$(LN) ipp $(SERVERBIN)/backend/$$file; \
done
- if test "x$(DNSSD_BACKEND)" != x; then \
+ if test "x$(DNSSD_BACKEND)" != x -a `uname` = Darwin; then \
$(RM) $(SERVERBIN)/backend/mdns; \
$(LN) $(DNSSD_BACKEND) $(SERVERBIN)/backend/mdns; \
fi
@@ -232,8 +232,10 @@
dnssd: dnssd.o ../cups/$(LIBCUPS) libbackend.a
echo Linking $@...
$(CC) $(LDFLAGS) -o dnssd dnssd.o libbackend.a $(LIBS)
- $(RM) mdns
- $(LN) dnssd mdns
+ if test `uname` = Darwin; then \
+ $(RM) mdns; \
+ $(LN) dnssd mdns; \
+ fi
#
Index: packaging/cups.spec.in
===================================================================
--- packaging/cups.spec.in (revision 10553)
+++ packaging/cups.spec.in (working copy)
@@ -25,7 +25,7 @@
%{?_with_dbus: %define _dbus --enable-dbus}
%{!?_with_dbus: %define _dbus --disable-dbus}
-%{!?_with_dnssd: %{!?_without_dnssd: %define _without_dnssd --without-dnssd}}
+%{!?_with_dnssd: %{!?_without_dnssd: %define _with_dnssd --with-dnssd}}
%{?_with_dnssd: %define _dnssd --enable-dnssd}
%{!?_with_dnssd: %define _dnssd --disable-dnssd}
@@ -179,6 +179,7 @@
%dir /usr/lib/cups
%dir /usr/lib/cups/backend
%if %{?_with_dnssd:1}%{!?_with_dnssd:0}
+# DNS-SD
/usr/lib/cups/backend/dnssd
%endif
/usr/lib/cups/backend/http
@@ -242,9 +243,17 @@
%dir /usr/share/doc/cups/images
/usr/share/doc/cups/images/*
+%dir /usr/share/doc/cups/ca
+/usr/share/doc/cups/ca/*
+%dir /usr/share/doc/cups/es
+/usr/share/doc/cups/es/*
%dir /usr/share/doc/cups/ja
/usr/share/doc/cups/ja/*
+%dir /usr/share/locale/ca
+/usr/share/locale/ca/cups_ca.po
+%dir /usr/share/locale/es
+/usr/share/locale/es/cups_es.po
%dir /usr/share/locale/ja
/usr/share/locale/ja/cups_ja.po