[Tizen-submit] 15968: Changes to Tizen/cups

noreply at tizen.org noreply at tizen.org
Mon Oct 14 13:24:14 GMT 2013


Hi,
GangHeok Kim have made the following changes to cups in project Tizen. Please review and accept ASAP.

Thank You,

[This message was auto-generated]

---

Request: #15968

  submit:       Tizen:build/cups(cleanup) -> Tizen


Message:
Submitter: GangHeok Kim <gangheok.kim at samsung.com>
Comments: Fixed build error based on 1.6.4
Git project: platform/upstream/cups
Tag: submit/tizen/20131014.104519
Commit: 542afd43930fc50ce563efe8e0d8ff78c77416e7 Update changelog

State:   new        2013-10-14T13:06:56 tizenrobot
Comment: <no comment>
changes files:
--------------
--- cups.changes
+++ cups.changes
@@ -0,0 +1,6 @@
+* Wed Oct 09 2013 Łukasz Stelmach <l.stelmach at samsung.com> upstream/1.6.4 at fe0f7d7
+- Adapt packaging/cups.spec for 1.6.4
+
+* Tue Jul 16 2013 Michael I Doherty <michael.i.doherty at intel.com> accepted/tizen/20130710.220945 at d56b191
+- Only use systemd socket activation, do not enable service itself
+

old:
----
  0002-add-systemd-support.patch
  0003-remove-packaging-file.patch
  cups-1.5.3-source.tar.bz2

new:
----
  0002-remove-packaging-file.patch
  cups-1.6.4-source.tar.bz2

spec files:
-----------
--- cups.spec
+++ cups.spec
@@ -16,7 +16,7 @@
 BuildRequires:  libtool
 BuildRequires:  systemd-devel
 %{?systemd_requires}
-%define have_systemd 1
+%define have_systemd 0
 Requires(pre):         /usr/sbin/groupadd
 Url:            http://www.cups.org/
 Summary:        The Common UNIX Printing System
@@ -25,9 +25,9 @@
 # Source0...Source9 is for sources from upstream:
 # URL for Source0: http://ftp.easysw.com/pub/cups/1.5.3/cups-1.5.3-source.tar.bz2
 # MD5 sum for Source0 on http://www.cups.org/software.php e1ad15257aa6f162414ea3beae0c5df8
-Version:        1.5.3
+Version:        1.6.4
 Release:        0
-VCS:            platform/upstream/cups#submit/tizen/20130710.130053-0-g1602e2cb2037a0437210db2f8f08d9e26607876a
+VCS:            platform/upstream/cups#submit/tizen/20131014.104519-0-g542afd43930fc50ce563efe8e0d8ff78c77416e7
 Source0:        cups-%{version}-source.tar.bz2
 # Require the exact matching version-release of the cups-libs sub-package because
 # non-matching CUPS libraries may let CUPS software crash (e.g. segfault)
@@ -51,8 +51,7 @@
 Source1001: 	cups.manifest
 # Patches auto-generated by git-buildpackage:
 Patch0:         0001-add-pam.patch
-Patch1:         0002-add-systemd-support.patch
-Patch2:         0003-remove-packaging-file.patch
+Patch1:         0002-remove-packaging-file.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 Requires:       /usr/bin/pdftops
@@ -153,10 +152,8 @@
 %setup -q -n cups-%{version}
 # 0001-add-pam.patch
 %patch0 -p1
-# 0002-add-systemd-support.patch
+# 0002-remove-packaging-file.patch
 %patch1 -p1
-# 0003-remove-packaging-file.patch
-%patch2 -p1
 cp %{SOURCE1001} .
 
 %build
@@ -178,7 +175,7 @@
 # so that the new default could be used as is but upstream may accept
 # cups-1.4.3-default-webcontent-path.patch in general but change its default
 # so that with-docdir is explicitly set here to be future proof:
-./configure \
+%configure \
 	--mandir=%{_mandir} \
 	--sysconfdir=%{_sysconfdir} \
 	--libdir=%{_libdir} \
@@ -198,6 +195,7 @@
 	--with-python \
 	--with-cachedir=/var/cache/cups \
 	--with-pdftops=/usr/bin/pdftops \
+	--without-xinetd \
 %if 0%{?have_systemd}
 	--with-systemdsystemunitdir=%{_unitdir} \

Please refer to OBS webUI for more details about this SR.


More information about the Tizen-submit mailing list