From 59c7aaa97204bc07a790aa83f1974afafe800a50 Mon Sep 17 00:00:00 2001 From: Denis Leroy Date: Apr 25 2007 17:46:04 +0000 Subject: - Update to 0.71 - Removed custom desktop file - Added patch to fix manpath --- diff --git a/.cvsignore b/.cvsignore index ae398e5..06cacdd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Transmission-0.6.1.tar.gz +Transmission-0.71.tar.gz diff --git a/sources b/sources index 5baa375..27f1d47 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1156a88c77ab71782b9261881ea13811 Transmission-0.6.1.tar.gz +2df675d20175f0a73d0c470f428018f8 Transmission-0.71.tar.gz diff --git a/transmission-0.6.1-gtk.patch b/transmission-0.6.1-gtk.patch deleted file mode 100644 index 2d45c92..0000000 --- a/transmission-0.6.1-gtk.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Transmission-0.6.1/configure.orig 2006-09-13 11:39:43.000000000 +0200 -+++ Transmission-0.6.1/configure 2006-09-13 13:17:46.000000000 +0200 -@@ -173,7 +173,7 @@ - verbose gtk_test - if runcmd pkg-config gtk+-2.0 - then -- if runcmd expr `pkg-config --modversion gtk+-2.0` '>=' 2.6.0 -+ if [ 1 ]; - then - cat > testconf.c << EOF - #include diff --git a/transmission-0.6.1-install.patch b/transmission-0.6.1-install.patch deleted file mode 100644 index 25287f8..0000000 --- a/transmission-0.6.1-install.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- Transmission-0.6.1/mk/common.mk.orig 2006-09-13 11:40:03.000000000 +0200 -+++ Transmission-0.6.1/mk/common.mk 2006-09-13 11:42:38.000000000 +0200 -@@ -62,20 +62,20 @@ - - define INSTALL_BIN_RULE - @echo "Install $<" -- @$(MKDIR) $(PREFIX)/bin -- @$(CP) $< $(PREFIX)/bin/ -+ @$(MKDIR) $(bindir) -+ @$(CP) $< $(bindir)/ - endef - - define INSTALL_LOCALE_RULE - @echo "Install $<" -- @$(MKDIR) $(LOCALEDIR)/$*/LC_MESSAGES -- @$(CP) $< $(LOCALEDIR)/$*/LC_MESSAGES/transmission-gtk.mo -+ @$(MKDIR) $(datadir)/locale/$*/LC_MESSAGES -+ @$(CP) $< $(datadir)/locale/$*/LC_MESSAGES/transmission-gtk.mo - endef - - define INSTALL_MAN_RULE - @echo "Install $<" -- @$(MKDIR) $(PREFIX)/man/man1 -- @$(CP) $< $(PREFIX)/man/man1/ -+ @$(MKDIR) $(mandir)/man1 -+ @$(CP) $< $(mandir)/man1/ - endef - - RM = rm -Rf diff --git a/transmission-0.71-manpath.patch b/transmission-0.71-manpath.patch new file mode 100644 index 0000000..2ee3700 --- /dev/null +++ b/transmission-0.71-manpath.patch @@ -0,0 +1,13 @@ +--- Transmission-0.71/mk/common.mk.orig 2007-04-25 18:54:30.000000000 +0200 ++++ Transmission-0.71/mk/common.mk 2007-04-25 19:01:00.000000000 +0200 +@@ -103,8 +103,8 @@ + + define INSTALL_MAN_RULE + @echo "Install $<" +- @$(MKDIR) $(DESTDIR)$(PREFIX)/man/man1 +- @$(CP) $< $(DESTDIR)$(PREFIX)/man/man1/ ++ @$(MKDIR) $(DESTDIR)$(PREFIX)/share/man/man1 ++ @$(CP) $< $(DESTDIR)$(PREFIX)/share/man/man1/ + endef + + define INSTALL_DESKTOP_RULE diff --git a/transmission.spec b/transmission.spec index 6741098..a0512f1 100644 --- a/transmission.spec +++ b/transmission.spec @@ -1,16 +1,14 @@ Name: transmission -Version: 0.6.1 -Release: 3%{?dist} +Version: 0.71 +Release: 1%{?dist} Summary: A lightweight GTK+ BitTorrent client Group: Applications/Internet License: MIT URL: http://transmission.m0k.org/ Source0: http://download.m0k.org/transmission/files/Transmission-%{version}.tar.gz -Source1: transmission.png -Patch0: transmission-0.6.1-install.patch -Patch1: transmission-0.6.1-gtk.patch +Patch0: transmission-0.71-manpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: openssl-devel @@ -18,9 +16,6 @@ BuildRequires: gtk2-devel >= 2.6.0 BuildRequires: desktop-file-utils BuildRequires: gettext intltool -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils - %description Transmission is a free, lightweight BitTorrent client. It features a @@ -30,8 +25,7 @@ back-end. %prep %setup -q -n Transmission-%{version} -%patch0 -p1 -b .inst -%patch1 -p1 -b .gtk +%patch0 -p1 -b .manpath %build @@ -41,27 +35,13 @@ make %{?_smp_mflags} CC=%{__cc} %install rm -rf $RPM_BUILD_ROOT -%makeinstall +make install DESTDIR=$RPM_BUILD_ROOT %find_lang %{name}-gtk -mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/ -install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/pixmaps/transmission.png - -cat << EOF > %{name}.desktop -[Desktop Entry] -Name=Transmission -Comment=Download from BitTorrents -Exec=transmission-gtk -Icon=transmission.png -Terminal=false -Type=Application -Encoding=UTF-8 -Categories=Application;GTK;Network;Internet;X-Fedora; -MimeType=application/x-bittorrent; -EOF - desktop-file-install --vendor fedora \ - --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.desktop + --delete-original \ + --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ \ + $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}-gtk.desktop %clean @@ -81,11 +61,17 @@ update-desktop-database > /dev/null 2>&1 || : %doc AUTHORS LICENSE NEWS README %{_bindir}/transmission* %{_datadir}/pixmaps/* -%{_datadir}/applications/*transmission.desktop +%{_datadir}/zsh/site-functions/* +%{_datadir}/applications/*transmission-gtk.desktop %doc %{_mandir}/man1/transmission* %changelog +* Wed Apr 25 2007 Denis Leroy - 0.71-1 +- Update to 0.71 +- Removed custom desktop file +- Added patch to fix manpath + * Thu Sep 28 2006 Denis Leroy - 0.6.1-3 - Added project icon - Honor cc variable