devel/gnokii gnokii-multilib-conflict.patch, NONE, 1.1 gnokii.spec, 1.14, 1.15

Jeremy Katz (katzj) fedora-extras-commits at redhat.com
Wed Oct 24 03:02:12 UTC 2007


Author: katzj

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

Modified Files:
	gnokii.spec 
Added Files:
	gnokii-multilib-conflict.patch 
Log Message:
* Tue Oct 23 2007 - Jeremy Katz <katzj at redhat.com> - 0.6.18-2
- Quick fix to multilib conflict (#335161)


gnokii-multilib-conflict.patch:

--- NEW FILE gnokii-multilib-conflict.patch ---
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
@@ -99,26 +99,13 @@ stamp-po: $(srcdir)/$(DOMAIN).pot
 
 # This target rebuilds $(DOMAIN).pot; it is an expensive operation.
 # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
-$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
+$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in
 	$(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
 	  --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \
 	  --files-from=$(srcdir)/POTFILES.in \
 	  --copyright-holder='$(COPYRIGHT_HOLDER)' \
 	  --msgid-bugs-address='$(MSGID_BUGS_ADDRESS)'
-	test ! -f $(DOMAIN).po || { \
-	  if test -f $(srcdir)/$(DOMAIN).pot; then \
-	    sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
-	    sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
-	    if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
-	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
-	    else \
-	      rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
-	      mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-	    fi; \
-	  else \
-	    mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
-	  fi; \
-	}
+	mv $(DOMAIN).po $(DOMAIN).pot
 
 # This rule has no dependencies: we don't need to update $(DOMAIN).pot at
 # every "make" invocation, only create it when it is missing.


Index: gnokii.spec
===================================================================
RCS file: /cvs/pkgs/devel/gnokii/gnokii.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gnokii.spec	17 Aug 2007 21:26:10 -0000	1.14
+++ gnokii.spec	24 Oct 2007 03:01:32 -0000	1.15
@@ -2,7 +2,7 @@
 
 Name:           gnokii
 Version:        0.6.18
-Release:        1%{?dist}
+Release: 2%{?dist}
 Summary:        Linux/Unix tool suite for various mobile phones
 
 Group:          Applications/Communications
@@ -24,6 +24,7 @@
 # Patch to fix the superfluous include statements
 Patch3:         %{name}-pkgconfig.patch
 Patch4:		%{name}-xgnokii-pkgconfig.patch
+Patch5: %{name}-multilib-conflict.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  flex
@@ -108,6 +109,7 @@
 %patch2 -p0
 %patch3 -p0
 %patch4 -p0
+%patch5 -p1 -b .multi
 install -pm 644 %{SOURCE5} smsd2mail.sh
 install -pm 644 %{SOURCE6} README.smsd2mail
 # Fix up X86_64 library placement issue
@@ -256,6 +258,9 @@
 %{_libdir}/pkgconfig/xgnokii.pc
 
 %changelog
+* Tue Oct 23 2007 - Jeremy Katz <katzj at redhat.com> - 0.6.18-2
+- Quick fix to multilib conflict (#335161)
+
 * Fri Aug 17 2007 - Linus Walleij <triad at df.lth.se> - 0.6.18-1
 - New upstream release
 




More information about the fedora-extras-commits mailing list