rpms/gnokii/EL-5 .cvsignore, 1.4, 1.5 gnokii-smsd.init, 1.1, 1.2 gnokii.spec, 1.9, 1.10 sources, 1.4, 1.5 gnokii-pkgconfig.patch, 1.2, NONE gnokii-smsd-rename.patch, 1.2, NONE gnokii-xgnokii-pkgconfig.patch, 1.2, NONE
Robert Scheck (robert)
fedora-extras-commits at redhat.com
Fri May 23 18:48:09 UTC 2008
Author: robert
Update of /cvs/pkgs/rpms/gnokii/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28313
Modified Files:
.cvsignore gnokii-smsd.init gnokii.spec sources
Removed Files:
gnokii-pkgconfig.patch gnokii-smsd-rename.patch
gnokii-xgnokii-pkgconfig.patch
Log Message:
- Do branching of gnokii for EPEL 5 to use it with RHEL and CentOS
- Set empty --vendor rather none for using desktop-file-install
- Fixed initscript as gnokii-smsd stays in /usr/bin not /usr/sbin
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnokii/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 23 Sep 2006 21:48:48 -0000 1.4
+++ .cvsignore 23 May 2008 18:47:03 -0000 1.5
@@ -1 +1 @@
-gnokii-0.6.14.tar.bz2
+gnokii-0.6.25.tar.bz2
Index: gnokii-smsd.init
===================================================================
RCS file: /cvs/pkgs/rpms/gnokii/EL-5/gnokii-smsd.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnokii-smsd.init 1 Apr 2006 18:24:59 -0000 1.1
+++ gnokii-smsd.init 23 May 2008 18:47:03 -0000 1.2
@@ -9,7 +9,7 @@
# config: /etc/gnokiirc
# config: /etc/sysconfig/gnokii-smsd
-exec=/usr/sbin/gnokii-smsd
+exec=/usr/bin/gnokii-smsd
prog=$(basename $exec)
# Make sure relevant files exist
Index: gnokii.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnokii/EL-5/gnokii.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnokii.spec 4 Oct 2006 22:23:39 -0000 1.9
+++ gnokii.spec 23 May 2008 18:47:03 -0000 1.10
@@ -1,12 +1,12 @@
# TODO: merge patches upstream where applicable
Name: gnokii
-Version: 0.6.14
+Version: 0.6.25
Release: 2%{?dist}
Summary: Linux/Unix tool suite for various mobile phones
Group: Applications/Communications
-License: GPL
+License: GPLv2+
URL: http://www.gnokii.org/
Source0: http://www.gnokii.org/download/gnokii/%{name}-%{version}.tar.bz2
Source2: %{name}-smsd.init
@@ -19,11 +19,6 @@
# 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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: flex
@@ -37,13 +32,9 @@
BuildRequires: bluez-libs-devel
BuildRequires: libusb-devel
%{?_with_libical:BuildRequires: libical-devel >= 0.24}
-%if "%fedora" >= "5"
BuildRequires: libXt-devel
BuildRequires: libXpm-devel
-%else
-# openssl-devel: https://bugzilla.redhat.com/159569
-BuildRequires: openssl-devel
-%endif
+BuildRequires: perl(XML::Parser)
Requires(pre): %{_sbindir}/groupadd
%description
@@ -105,71 +96,51 @@
%setup -q
%patch0 -p0
%patch1 -p0
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
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
-mv iconv.tmp smsd/ChangeLog
-iconv -f iso8859-2 -t utf8 -o iconv.tmp xgnokii/ChangeLog
-mv iconv.tmp xgnokii/ChangeLog
-
%build
%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
+make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT __docinst
-
-make install install-docs DESTDIR=$RPM_BUILD_ROOT \
- xmandir=%{_mandir}/man1 docdir=/__docinst
-
-mv $RPM_BUILD_ROOT/__docinst .
-rm __docinst/{README-MacOSX,README-WIN32,packaging-howto}
+make install DESTDIR=$RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT pkglibdir=%{_libdir}/gnokii-smsd -C smsd \
- DB_LIBS="libfile.la libpq.la libmysql.la"
-mv $RPM_BUILD_ROOT%{_sbindir}/{,gnokii-}smsd
+# Rename smsd to gnokii-smsd
+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
-rm $RPM_BUILD_ROOT%{_libdir}{,/gnokii-smsd}/lib*.la
-
-install -Dpm 644 Docs/sample/gnokiirc $RPM_BUILD_ROOT%{_sysconfdir}/gnokiirc
+# Remove libtool droppings
+rm $RPM_BUILD_ROOT%{_libdir}{,/smsd}/lib*.la
+# Fix up the default desktop file
desktop-file-install \
--delete-original \
- --vendor fedora \
+ --vendor "" \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--mode 644 \
--add-category X-Fedora \
$RPM_BUILD_ROOT%{_datadir}/applications/xgnokii.desktop
+# Convert the default icons to PNG
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
convert Docs/sample/logo/gnokii.xpm \
$RPM_BUILD_ROOT%{_datadir}/pixmaps/xgnokii.png
chmod 644 $RPM_BUILD_ROOT%{_datadir}/pixmaps/xgnokii.png
+# Install the configuration files
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
+cp -a Docs/sample/gnokiirc $RPM_BUILD_ROOT%{_sysconfdir}/
+# Install the docs
+mv $RPM_BUILD_ROOT%{_datadir}/doc/gnokii/ temporary-gnokii-docs/
%find_lang %{name}
@@ -206,26 +177,21 @@
%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}/ppm2nokia
%{_bindir}/sendsms
-%{_bindir}/todologo
-%{_bindir}/waitcall
-%{_sbindir}/gnokiid
+%{_bindir}/gnokiid
%{_libdir}/libgnokii.so.*
%{_mandir}/man1/gnokii.1*
-%{_mandir}/man1/ppm2nokia.1*
%{_mandir}/man1/sendsms.1*
-%{_mandir}/man1/todologo.1*
%{_mandir}/man8/gnokiid.8*
%{_mandir}/man8/mgnokiidev.8*
%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
@@ -238,20 +204,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,-)
@@ -261,6 +227,52 @@
%{_libdir}/pkgconfig/xgnokii.pc
%changelog
+* Fri May 23 2008 Robert Scheck <robert at fedoraproject.org> 0.6.25-2
+- Set empty --vendor rather none for using desktop-file-install
+- Fixed initscript as gnokii-smsd stays in /usr/bin not /usr/sbin
+
+* Mon May 19 2008 - Bastien Nocera <bnocera at redhat.com> - 0.6.25-1
+- Update to 0.6.25
+
+* 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.
+
+* Thu Dec 6 2007 - Linus Walleij <triad at df.lth.se> - 0.6.22-2
+- Pick up new libssl .solib version dependency.
+
+* Thu Nov 29 2007 - Bastien Nocera <bnocera at redhat.com> - 0.6.22-1
+- Update to 0.6.22
+
+* Thu Nov 01 2007 - Bastien Nocera <bnocera at redhat.com> - 0.6.20-1
+- Update to 0.6.20
+
+* 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)
+
+* Fri Aug 17 2007 - Linus Walleij <triad at df.lth.se> - 0.6.18-1
+- New upstream release
+
+* Fri Aug 17 2007 - Linus Walleij <triad at df.lth.se> - 0.6.17-2
+- Update license field from GPL to GPLv2+
+
+* Wed Jul 04 2007 - Bastien Nocera <bnocera at redhat.com> - 0.6.17-1
+- New upstream release
+
+* Mon Jul 02 2007 - Bastien Nocera <bnocera at redhat.com> - 0.6.16-1
+- New upstream release
+- Update smsd name change patch
+- ppm2nokia, waitcall and todologo have moved to gnokii-extras, as per
+ upstream
+
+* Wed Dec 06 2006 Linus Walleij <triad at df.lth.se> - 0.6.14-3
+- Rebuild to pick up new libpq IF
+
* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 0.6.14-2
- rebuilt for unwind info generation, broken in gcc-4.1.1-21
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnokii/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 23 Sep 2006 21:48:48 -0000 1.4
+++ sources 23 May 2008 18:47:03 -0000 1.5
@@ -1 +1 @@
-89449d613c7a7e765a0d8da57ef1bb88 gnokii-0.6.14.tar.bz2
+42cb950f0c6e05b8bdd98009369bc415 gnokii-0.6.25.tar.bz2
--- gnokii-pkgconfig.patch DELETED ---
--- gnokii-smsd-rename.patch DELETED ---
--- gnokii-xgnokii-pkgconfig.patch DELETED ---
More information about the fedora-extras-commits
mailing list