rpms/gnokii/devel gnokii-pkgconfig.patch, 1.2, 1.3 gnokii-xgnokii-pkgconfig.patch, 1.2, 1.3 gnokii.spec, 1.22, 1.23 gnokii-multilib-conflict.patch, 1.2, NONE gnokii-smsd-rename.patch, 1.3, NONE

[Bastien Nocera (hadess)]

Author: hadess

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

Modified Files:
	gnokii-pkgconfig.patch gnokii-xgnokii-pkgconfig.patch 
	gnokii.spec 
Removed Files:
	gnokii-multilib-conflict.patch gnokii-smsd-rename.patch 
Log Message:
* Thu Mar 20 2008 - Bastien Nocera <bnocera at redhat.com> - 0.6.24-1
- Update to 0.6.24


gnokii-pkgconfig.patch:

Index: gnokii-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnokii/devel/gnokii-pkgconfig.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnokii-pkgconfig.patch	11 Aug 2006 21:30:32 -0000	1.2
+++ gnokii-pkgconfig.patch	21 Mar 2008 01:42:04 -0000	1.3
@@ -5,7 +5,7 @@
  Name: gnokii
  Description: Gnokii library interface
  Version: @VERSION@
--Libs: -L${libdir} -lgnokii @LIBS@ @XPM_LIBS@ @LIBICONV@
+-Libs: -L${libdir} -lgnokii @LIBS@ @XPM_LIBS@ @INTLLIBS@
 -Cflags: -I${includedir} @XPM_CFLAGS@
 +Libs: -L${libdir} -lgnokii
 +Cflags: -I${includedir}

gnokii-xgnokii-pkgconfig.patch:

Index: gnokii-xgnokii-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gnokii/devel/gnokii-xgnokii-pkgconfig.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnokii-xgnokii-pkgconfig.patch	11 Aug 2006 21:30:32 -0000	1.2
+++ gnokii-xgnokii-pkgconfig.patch	21 Mar 2008 01:42:04 -0000	1.3
@@ -5,7 +5,7 @@
  Name: xgnokii
  Description: GTK2 gnokii library interface
  Version: @XVERSION@
--Libs: -L${libdir} -lgnokii @LIBS@ @XPM_LIBS@ @LIBICONV@
+-Libs: -L${libdir} -lgnokii @LIBS@ @XPM_LIBS@ @INTLLIBS@
 -Cflags: -I${includedir} @XPM_CFLAGS@
 +Libs: -L${libdir} -lgnokii
 +Cflags: -I${includedir}


Index: gnokii.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnokii/devel/gnokii.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- gnokii.spec	11 Feb 2008 08:29:08 -0000	1.22
+++ gnokii.spec	21 Mar 2008 01:42:04 -0000	1.23
@@ -1,8 +1,8 @@
 # TODO: merge patches upstream where applicable
 
 Name:           gnokii
-Version:        0.6.22
-Release:        3%{?dist}
+Version:        0.6.24
+Release:        1%{?dist}
 Summary:        Linux/Unix tool suite for various mobile phones
 
 Group:          Applications/Communications
@@ -19,12 +19,9 @@
 # Patch to remove port locking and apply the system-wide /usr/sbin directory
 # to the path instead of the default /usr/local
 Patch1:         %{name}-config.patch
-# Patch to rename smdsd to gnokii-smsd (also in doc)
-Patch2:         %{name}-smsd-rename.patch
 # 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
@@ -101,21 +98,13 @@
 %setup -q
 %patch0 -p0
 %patch1 -p0
-%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
-%{__sed} -i -e 's|/lib /usr/lib\b|/%{_lib} %{_libdir}|' configure
 # Polish default font, cool but ISO8859-2
-iconv -f iso8859-2 -t utf8 -o iconv.tmp ChangeLog
-mv iconv.tmp ChangeLog
 iconv -f iso8859-2 -t utf8 -o iconv.tmp Docs/CREDITS
 mv iconv.tmp Docs/CREDITS
-iconv -f iso8859-2 -t utf8 -o iconv.tmp Docs/README
-mv iconv.tmp Docs/README
 iconv -f iso8859-2 -t utf8 -o iconv.tmp COPYRIGHT
 mv iconv.tmp COPYRIGHT
 iconv -f iso8859-2 -t utf8 -o iconv.tmp smsd/ChangeLog
@@ -128,29 +117,17 @@
 %configure --enable-security --disable-rpath --disable-static \
   %{?_with_libical:--with-libical=%{_prefix}}
 make # -j X for X > 1 fails as of 0.5.6 - 0.6.7
-make %{?_smp_mflags} -C smsd all libpq.la libmysql.la libfile.la
 
 
 %install
-rm -rf $RPM_BUILD_ROOT __docinst
-
-make install install-devel DESTDIR=$RPM_BUILD_ROOT \
-  xmandir=%{_mandir}/man1 docdir=/__docinst
-
-mv $RPM_BUILD_ROOT/__docinst .
-rm -f __docinst/{README-MacOSX,README-WIN32,packaging-howto,ChangeLog,COPYING,COPYRIGHT,TODO,MAINTAINERS}
-
-make install DESTDIR=$RPM_BUILD_ROOT pkglibdir=%{_libdir}/gnokii-smsd -C smsd \
-  DB_LIBS="libfile.la libpq.la libmysql.la"
-pushd include
 make install DESTDIR=$RPM_BUILD_ROOT
-popd
-mv $RPM_BUILD_ROOT%{_sbindir}/{,gnokii-}smsd
-mv $RPM_BUILD_ROOT%{_mandir}/man8/{,gnokii-}smsd.8
 
-rm $RPM_BUILD_ROOT%{_libdir}{,/gnokii-smsd}/lib*.la
+mv $RPM_BUILD_ROOT%{_bindir}/{,gnokii-}smsd
+mv $RPM_BUILD_ROOT%{_mandir}/man8/{,gnokii-}smsd.8
+sed -i 's,smsd ,gnokii-smsd ,' $RPM_BUILD_ROOT%{_mandir}/man8/gnokii-smsd.8
+sed -i 's,smsd.,gnokii-smsd.,' $RPM_BUILD_ROOT%{_mandir}/man8/gnokii-smsd.8
 
-install -Dpm 644 Docs/sample/gnokiirc $RPM_BUILD_ROOT%{_sysconfdir}/gnokiirc
+rm $RPM_BUILD_ROOT%{_libdir}{,/smsd}/lib*.la
 
 desktop-file-install \
   --delete-original \
@@ -165,11 +142,14 @@
   $RPM_BUILD_ROOT%{_datadir}/pixmaps/xgnokii.png
 chmod 644 $RPM_BUILD_ROOT%{_datadir}/pixmaps/xgnokii.png
 
+cp -a Docs/sample/gnokiirc $RPM_BUILD_ROOT%{_sysconfdir}
+
 install -Dpm 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/gnokii-smsd
 install -Dpm 640 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/gnokii-smsd
 install -Dpm 644 %{SOURCE4} \
   $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/gnokii-smsd
 
+mv $RPM_BUILD_ROOT%{_datadir}/doc/gnokii/ temporary-gnokii-docs/
 
 %find_lang %{name}
 
@@ -206,12 +186,12 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc ChangeLog COPY* MAINTAINERS TODO VERSION __docinst/*
+%doc ChangeLog COPY* MAINTAINERS TODO temporary-gnokii-docs/*
 %config(noreplace) %{_sysconfdir}/gnokiirc
 %attr(4750,root,gnokii) %{_sbindir}/mgnokiidev
 %{_bindir}/gnokii
 %{_bindir}/sendsms
-%{_sbindir}/gnokiid
+%{_bindir}/gnokiid
 %{_libdir}/libgnokii.so.*
 %{_mandir}/man1/gnokii.1*
 %{_mandir}/man1/sendsms.1*
@@ -220,7 +200,7 @@
 
 %files -n xgnokii
 %defattr(-,root,root,-)
-%doc xgnokii/ChangeLog xgnokii/README.vcard xgnokii/VERSION
+%doc xgnokii/ChangeLog xgnokii/README.vcard
 %{_bindir}/xgnokii
 %{_datadir}/pixmaps/xgnokii.png
 %{_datadir}/applications/*xgnokii.desktop
@@ -233,20 +213,20 @@
 %attr(-,gnokii,gnokii) %config(noreplace) %{_sysconfdir}/sysconfig/gnokii-smsd
 %config(noreplace) %{_sysconfdir}/logrotate.d/gnokii-smsd
 %{_initrddir}/gnokii-smsd
-%{_sbindir}/gnokii-smsd
+%{_bindir}/gnokii-smsd
 %{_mandir}/man8/gnokii-smsd.8*
-%dir %{_libdir}/gnokii-smsd/
-%{_libdir}/gnokii-smsd/libfile.so
+%dir %{_libdir}/smsd/
+%{_libdir}/smsd/libsmsd_file.so
 
 %files smsd-pgsql
 %defattr(-,root,root,-)
 %doc smsd/sms.tables.pq.sql
-%{_libdir}/gnokii-smsd/libpq.so
+%{_libdir}/smsd/libsmsd_pq.so
 
 %files smsd-mysql
 %defattr(-,root,root,-)
 %doc smsd/sms.tables.mysql.sql
-%{_libdir}/gnokii-smsd/libmysql.so
+%{_libdir}/smsd/libsmsd_mysql.so
 
 %files devel
 %defattr(-,root,root,-)
@@ -256,6 +236,9 @@
 %{_libdir}/pkgconfig/xgnokii.pc
 
 %changelog
+* Thu Mar 20 2008 - Bastien Nocera <bnocera at redhat.com> - 0.6.24-1
+- Update to 0.6.24
+
 * Mon Feb 11 2008 - Linus Walleij <triad at df.lth.se> - 0.6.22-3
 - Rebuild for GCC 4.3.
 


--- gnokii-multilib-conflict.patch DELETED ---


--- gnokii-smsd-rename.patch DELETED ---