devel/gnokii gnokii-multilib-conflict.patch, 1.1, 1.2 gnokii.spec, 1.15, 1.16

[Jeremy Katz (katzj)]

Author: katzj

Update of /cvs/pkgs/devel/gnokii
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20523

Modified Files:
	gnokii-multilib-conflict.patch gnokii.spec 
Log Message:
* Sun Oct 28 2007 Jeremy Katz <katzj at redhat.com> - 0.6.18-3
- Even better multilib fixing (#335161)


gnokii-multilib-conflict.patch:

Index: gnokii-multilib-conflict.patch
===================================================================
RCS file: /cvs/pkgs/devel/gnokii/gnokii-multilib-conflict.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnokii-multilib-conflict.patch	24 Oct 2007 03:01:32 -0000	1.1
+++ gnokii-multilib-conflict.patch	28 Oct 2007 20:20:47 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up gnokii-0.6.18/po/Makefile.in.in.multi gnokii-0.6.18/po/Makefile.in.in
 --- gnokii-0.6.18/po/Makefile.in.in.multi	2007-07-24 16:31:42.000000000 -0400
-+++ gnokii-0.6.18/po/Makefile.in.in	2007-10-23 22:09:52.000000000 -0400
++++ gnokii-0.6.18/po/Makefile.in.in	2007-10-28 16:04:46.000000000 -0400
 @@ -99,26 +99,13 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
  
  # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
@@ -30,3 +30,23 @@
  
  # This rule has no dependencies: we don't need to update $(DOMAIN).pot at
  # every "make" invocation, only create it when it is missing.
+@@ -128,7 +115,7 @@ $(srcdir)/$(DOMAIN).pot:
+ 
+ # This target rebuilds a PO file if $(DOMAIN).pot has changed.
+ # Note that a PO file is not touched if it doesn't need to be changed.
+-$(POFILES): $(srcdir)/$(DOMAIN).pot
++$(POFILES): 
+ 	@lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
+ 	if test -f "$(srcdir)/$${lang}.po"; then \
+ 	  test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
+diff -up gnokii-0.6.18/po/POTFILES.in.multi gnokii-0.6.18/po/POTFILES.in
+--- gnokii-0.6.18/po/POTFILES.in.multi	2007-10-28 15:25:16.000000000 -0400
++++ gnokii-0.6.18/po/POTFILES.in	2007-10-28 15:25:32.000000000 -0400
+@@ -59,7 +59,6 @@ smsd/smsd.c
+ utils/mgnokiidev.c
+ xgnokii/xgnokii.c
+ xgnokii/xgnokii_calendar.c
+-xgnokii/xgnokii_cfg.c
+ xgnokii/xgnokii_common.c
+ xgnokii/xgnokii_contacts.c
+ xgnokii/xgnokii_data.c


Index: gnokii.spec
===================================================================
RCS file: /cvs/pkgs/devel/gnokii/gnokii.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnokii.spec	24 Oct 2007 03:01:32 -0000	1.15
+++ gnokii.spec	28 Oct 2007 20:20:47 -0000	1.16
@@ -2,7 +2,7 @@
 
 Name:           gnokii
 Version:        0.6.18
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary:        Linux/Unix tool suite for various mobile phones
 
 Group:          Applications/Communications
@@ -258,6 +258,9 @@
 %{_libdir}/pkgconfig/xgnokii.pc
 
 %changelog
+* Sun Oct 28 2007 Jeremy Katz <katzj at redhat.com> - 0.6.18-3
+- Even better multilib fixing (#335161)
+
 * Tue Oct 23 2007 - Jeremy Katz <katzj at redhat.com> - 0.6.18-2
 - Quick fix to multilib conflict (#335161)