rpms/apollon/devel apollon-1.0.1-dtfix.patch, NONE, 1.1 apollon.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Tue Dec 20 15:14:08 UTC 2005


Author: rdieter

Update of /cvs/extras/rpms/apollon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13147/devel

Modified Files:
	.cvsignore sources 
Added Files:
	apollon-1.0.1-dtfix.patch apollon.spec 
Log Message:
auto-import apollon-1.0.1-3 on branch devel from apollon-1.0.1-3.src.rpm

apollon-1.0.1-dtfix.patch:

--- NEW FILE apollon-1.0.1-dtfix.patch ---
--- apollon-1.0.1/apollon/Apollon.desktop.dtfix	2004-10-13 11:33:15.000000000 -0500
+++ apollon-1.0.1/apollon/Apollon.desktop	2004-10-14 07:06:42.225421680 -0500
@@ -1,16 +1,13 @@
 [Desktop Entry]
-Name=Apollon File Sharing Client
-Name[de]=Apollon, Tauschbörse
+Name=Apollon
 Comment=The ultimate file sharing program for Linux - OpenFT, Gnutella, FastTrack (Kazaa)
-Comment[de]=Das ultimative Tauschbörsenprogramm für Linux - OpenFT, Gnutella, Fasttrack (Kazaa)
-GenericName=Apollon File Sharing Client
-GenericName[de]=Apollon, Tauschbörse
+GenericName=File Sharing Client
 Exec=apollon
 Type=Application
 Encoding=UTF-8
 Terminal=false
 Icon=apollon
-Categories=Application;Qt;KDE;Network;FileTransfer
+Categories=Application;Qt;KDE;Network;FileTransfer;
 StartupNotify=true
 StartupWMClass=apollon
 


--- NEW FILE apollon.spec ---

Summary: Filesharing client
Name:	 apollon
Version: 1.0.1
Release: 3%{?dist}

License: GPL
Group: 	 Applications/Internet
URL: 	 http://apollon.sourceforge.net/
Source:	 http://dl.sourceforge.net/sourceforge/apollon/apollon-1.0.1.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Fix Name/GenericName, append ; to Categories, 
# remove lines containing non UTF-8 chars ([de] entries)
Patch1: apollon-1.0.1-dtfix.patch 

BuildRequires: gettext
BuildRequires: desktop-file-utils
BuildRequires: gift-devel

BuildRequires: qt-devel >= 1:3.3
BuildRequires: kdelibs-devel >= 6:3.3
# Hack/woraround kdelibs-devel bug: https://bugzilla.redhat.com/bugzilla/170602
BuildRequires: libacl-devel

%description
A filesharing client which uses giFT.


%prep
%setup -q 

%patch1 -p1 -b .dtfix



%build
unset QTDIR || : ; . /etc/profile.d/qt.sh
export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include

%configure \
  --disable-rpath \
  --disable-debug --disable-warnings \
  --disable-dependency-tracking --enable-final

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
desktop-file-install --delete-original --vendor fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --add-category Application \
  --add-category X-Fedora \
  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop

## File lists
# locale's
%find_lang %{name} || touch %{name}.lang
# HTML (1.0)
HTML_DIR=$(kde-config --expandvars --install html)
if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
  if [ -d $lang_dir ]; then
    lang=$(basename $lang_dir)
    echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
    # replace absolute symlinks with relative ones
    pushd $lang_dir
      for i in *; do
        [ -d $i -a -L $i/common ] && rm -f $i/common && ln -sf ../common $i/common
      done
    popd
  fi
done
fi

## Unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la


%clean
rm -rf $RPM_BUILD_ROOT


%post
/sbin/ldconfig
for icon_theme in crystalsvg hicolor ; do
  touch --no-create %{_datadir}/icons/${icon_theme} ||:
  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done

%postun
/sbin/ldconfig
for icon_theme in crystalsvg hicolor ; do
  touch --no-create %{_datadir}/icons/${icon_theme} ||:
  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
done


%files -f %{name}.lang
%defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING README TODO
%{_bindir}/apollon
%{_libdir}/libapollon.*
%{_datadir}/applications/*.desktop
%{_datadir}/icons/crystalsvg/*/*/*
%{_datadir}/icons/hicolor/*/*/*


%changelog
* Tue Dec 20 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.1-3
- BR: libacl-devel (workaround kdelibs bug #170602)

* Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.1-2 
- more %%doc's: AUTHORS ChangeLog COPYING TODO 
- drop %%_libdir/lib*.la

* Thu Dec 08 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.0.1-1 
- cleanup for Fedora Extras

* Wed Oct 13 2004 Rex Dieter <rexdieter at sf.net> 1.0.1-0.lvn.1
- 1.0.1

* Tue Sep 28 2004 Rex Dieter <rexdieter at sf.net> 1.0-0.lvn.1
- 1.0
- .desktop: touchup Name/GenericName

* Thu Jul 29 2004 Rex Dieter <rexdieter at sf.net> 0.9.4-0.lvn.1
- fdr -> lvn

* Thu Jul 22 2004 Rex Dieter <rexdieter at sf.net> 0.9.4-0.fdr.1
- 0.9.4(-1)
- fedora'ize

* Thu Feb 25 2004 Dries Verachtert <dries at ulyssis.org> 0.9.2-3
- moved the apollon menu entry to 'more internet applications'
  bug found by Sindre Pedersen Bjørda, thanks!

* Wed Feb 25 2004 Dries Verachtert <dries at ulyssis.org> 0.9.2-2
- removed the dependencies on gift plugins
  bug found by Sindre Pedersen Bjørda, thanks!

* Wed Feb 4 2004 Dries Verachtert <dries at ulyssis.org> 0.9.2-1
- update to version 0.9.2

* Sat Jan 10 2004 Dries Verachtert <dries at ulyssis.org> 0.9.1-2
- spec file cleanup
- other desktop file

* Mon Dec 29 2003 Dries Verachtert <dries at ulyssis.org> 0.9.1-1
- first packaging for Fedora Core 1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apollon/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Dec 2005 15:13:36 -0000	1.1
+++ .cvsignore	20 Dec 2005 15:14:06 -0000	1.2
@@ -0,0 +1 @@
+apollon-1.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apollon/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Dec 2005 15:13:36 -0000	1.1
+++ sources	20 Dec 2005 15:14:06 -0000	1.2
@@ -0,0 +1 @@
+835d783691b1c75cf772042d72d51d82  apollon-1.0.1.tar.bz2




More information about the scm-commits mailing list