ALT Linux Team development discussions
 help / color / mirror / Atom feed
* [devel] E: incoming i586 reject: qtsmbstatus-2.0.2-alt1
@ 2007-11-19 22:21 Motsyo Gennadi aka Drool
  2007-11-19 22:23 ` Dmitry V. Levin
  0 siblings, 1 reply; 3+ messages in thread
From: Motsyo Gennadi aka Drool @ 2007-11-19 22:21 UTC (permalink / raw)
  To: ALT Devel discussion list

[-- Attachment #1: Type: text/plain, Size: 629 bytes --]

========================================
Patch #0 (qtsmbstatus-2.0.2-alt_dirs.diff):
+ echo 'Patch #0 (qtsmbstatus-2.0.2-alt_dirs.diff):'
+ /usr/bin/patch -p1
patching file client/client.pro
Hunk #2 FAILED at 82.
1 out of 2 hunks FAILED -- saving rejects to file client/client.pro.rej
patching file server/server.pro
Hunk #3 FAILED at 69.
1 out of 3 hunks FAILED -- saving rejects to file server/server.pro.rej
error: Bad exit status from /usr/src/tmp/rpm-tmp.26432 (%prep)
========================================

	В сизифе действие патчера отличается от бранчевого? На бранче все
собирается в хашере. Или я что-то не понимаю?

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: qtsmbstatus-2.0.2-alt_dirs.diff --]
[-- Type: text/x-patch; name="qtsmbstatus-2.0.2-alt_dirs.diff", Size: 1222 bytes --]

--- qtsmbstatus-2.0.2/client/client.pro.orig	2007-11-14 23:11:38 +0300
+++ qtsmbstatus-2.0.2/client/client.pro	2007-11-19 22:37:32 +0300
@@ -61,7 +61,7 @@ FORMS +=  form_smbstatus.ui \
 # install
 !win32 {
 # Translation
-TRANSDIR   = /usr/local/share/qtsmbstatus
+TRANSDIR   = /usr/share/qtsmbstatus
 TRANSFILES = ./tr/*.qm
 trans.path = $$TRANSDIR 
 trans.files = $$TRANSFILES 
@@ -88,7 +88,7 @@ menu.path = $$MENUDIR
 menu.files = $$MENUFILES
 
 #manpage
-MANDIR   = /usr/local/share/man/man7
+MANDIR   = /usr/share/man/man7
 MANFILES = qtsmbstatus.7.gz
 manpage.path = $$MANDIR
 manpage.files = $$MANFILES
--- qtsmbstatus-2.0.2/server/server.pro.orig	2007-11-14 23:11:38 +0300
+++ qtsmbstatus-2.0.2/server/server.pro	2007-11-19 22:34:24 +0300
@@ -46,7 +46,7 @@ PAMFILE = ./pam.d/qtsmbstatusd
 pam.path = $$PAMDIR 
 pam.files += $$PAMFILE
 
-INITDIR= /etc/init.d
+INITDIR= /etc/rc.d/init.d
 INITFILE = ./etc/qtsmbstatusd
 init.path = $$INITDIR 
 init.files += $$INITFILE
@@ -61,7 +61,7 @@ doc.path = $$DOCDIR 
 doc.files += $$DOCFILES 
 
 #manpage
-MANDIR   = /usr/local/share/man/man7
+MANDIR   = /usr/share/man/man7
 MANFILES = qtsmbstatusd.7.gz
 manpage.path = $$MANDIR
 manpage.files = $$MANFILES

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-11-19 22:37 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-11-19 22:21 [devel] E: incoming i586 reject: qtsmbstatus-2.0.2-alt1 Motsyo Gennadi aka Drool
2007-11-19 22:23 ` Dmitry V. Levin
2007-11-19 22:37   ` Motsyo Gennadi aka Drool

ALT Linux Team development discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror http://lore.altlinux.org/devel/0 devel/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 devel devel/ http://lore.altlinux.org/devel \
		devel@altlinux.org devel@altlinux.ru devel@lists.altlinux.org devel@lists.altlinux.ru devel@linux.iplabs.ru mandrake-russian@linuxteam.iplabs.ru sisyphus@linuxteam.iplabs.ru
	public-inbox-index devel

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://lore.altlinux.org/org.altlinux.lists.devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git