[pcmanx-gtk2] - Update to 1.1 - Use upstream desktop entry file - BR: libtool-ltdl-devel - Untabified

cheeselee cheeselee at fedoraproject.org
Mon Jan 30 13:08:31 UTC 2012


commit 092bcb47203cae2b2ff8a44310713128bb3d32db
Author: Robin Lee <cheeselee at fedoraproject.org>
Date:   Mon Jan 30 21:07:55 2012 +0800

    - Update to 1.1
    - Use upstream desktop entry file
    - BR: libtool-ltdl-devel
    - Untabified

 .gitignore       |    1 +
 pcmanx-gtk2.spec |   39 +++++++++++++++++++++++----------------
 pcmanx.desktop   |   11 -----------
 sources          |    2 +-
 4 files changed, 25 insertions(+), 28 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 65ae67a..5d99415 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /pcmanx-gtk2-20101026.tar.bz2
 /pcmanx-gtk2-1.0.tar.bz2
+/pcmanx-gtk2-1.1.tar.xz
diff --git a/pcmanx-gtk2.spec b/pcmanx-gtk2.spec
index c4c6424..f5e02dc 100644
--- a/pcmanx-gtk2.spec
+++ b/pcmanx-gtk2.spec
@@ -1,16 +1,15 @@
-Summary:	Telnet client designed for BBS browsing
-Name:		pcmanx-gtk2
-Version:	1.0
-Release:	1%{?dist}
-License:	GPLv2+
-Group:		Applications/Internet
-Source0:    http://pcmanx-gtk2.googlecode.com/files/%{name}-%{version}.tar.bz2
-Source1:	pcmanx.desktop
-URL:		http://code.google.com/p/pcmanx-gtk2/
-BuildRequires:	gtk2-devel libXft-devel
-BuildRequires:	libnotify-devel >= 0.7.0
-BuildRequires:	desktop-file-utils gettext
-BuildRequires:	intltool
+Summary:    Telnet client designed for BBS browsing
+Name:       pcmanx-gtk2
+Version:    1.1
+Release:    1%{?dist}
+License:    GPLv2+
+Group:      Applications/Internet
+Source0:    http://pcmanx-gtk2.googlecode.com/files/%{name}-%{version}.tar.xz
+URL:        http://code.google.com/p/pcmanx-gtk2/
+BuildRequires:  gtk2-devel libXft-devel libtool-ltdl-devel
+BuildRequires:  libnotify-devel >= 0.7.0
+BuildRequires:  desktop-file-utils gettext
+BuildRequires:  intltool
 
 
 %description
@@ -24,6 +23,9 @@ browsing with the ability to process double-byte characters.
 
 %prep
 %setup -q
+# remove the bundled libltdl
+rm -fr libltdl
+sed -i -e 's/libltdl//' Makefile.in
 
 
 %build
@@ -33,10 +35,9 @@ make %{?_smp_mflags}
 %install
 make install INSTALL="install -c -p" DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %{SOURCE1}
+  $RPM_BUILD_ROOT%{_datadir}/applications/pcmanx.desktop
 
 %find_lang pcmanx
 
@@ -46,11 +47,17 @@ desktop-file-install \
 %{_bindir}/*
 %{_datadir}/applications/*
 %{_datadir}/pcmanx/
-%{_datadir}/pixmaps/*.png
+%{_datadir}/pixmaps/*
 %{_mandir}/man1/pcmanx.1*
 
 
 %changelog
+* Mon Jan 30 2012 Robin Lee <cheeselee at fedoraproject.org> - 1.1-1
+- Update to 1.1
+- Use upstream desktop entry file
+- BR: libtool-ltdl-devel
+- Untabified
+
 * Thu Jan 12 2012 Robin Lee <cheeselee at fedoraproject.org> - 1.0-1
 - Update to 1.0
 - Specfile cleanup
diff --git a/sources b/sources
index da12246..950f9d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b2fe19a69e34a832a51319f44ec29539  pcmanx-gtk2-1.0.tar.bz2
+8c23271d5f2338307d4f46bf1864351e  pcmanx-gtk2-1.1.tar.xz


More information about the scm-commits mailing list