aMule Forum

Please login or register.

Login with username, password and session length
Advanced search  

News:

We're back! (IN POG FORM)

Pages: 1 [2]

Author Topic: Something big new in today's cvs?  (Read 8875 times)

Gerd78

  • Hero Member
  • *****
  • Karma: 9
  • Offline Offline
  • Posts: 681
Re: Something big new in today's cvs?
« Reply #15 on: December 13, 2005, 08:03:48 AM »

Quote
Originally posted by IhmSelbst
btw:
perhaps, someone should update the current cvs-specfile, too. - seems, as if it doesn´t include some minor changes, you posted above, too...  :))
Yes, I thought about preparing a patch for that. There's also some other old stuff elsewhere in various m4 files that is not needed any more after removal of wx 2.4.2 support. Maybe I'll do that, but I think it's too late for 2.1.0 and it's not that important anyway...
Quote
Originally posted by IhmSelbst
of course, i blowed up my suse10.0spec first, lol. so the rpm is up somewhat later today.
but, for some reason, the suse10.0rpm seems to have increased a bit, while the 9.3-version shrinked a little. will check this out asap, but must fly now. (the rl calls...) ;(
That's probably related to different GCC versions. What exactly did you do? -Os? If so, don't specify --disable-optimize or --enable-optimize. Simply omit it, the CFLAGS/CXXFLAGS environment variables take care of it.
Logged

IhmSelbst

  • Full Member
  • ***
  • Karma: 3
  • Offline Offline
  • Posts: 220
    • http://www.ed2k-serverboard.de/
Re: Something big new in today's cvs?
« Reply #16 on: December 14, 2005, 05:42:37 AM »

Quote
Originally posted by Gerd78
That's probably related to different GCC versions. What exactly did you do? -Os? If so, don't specify --disable-optimize or --enable-optimize. Simply omit it, the CFLAGS/CXXFLAGS environment variables take care of it.

hi again, and thx for the patience. :)
yep, i did the -Os-thing in the suse10.0, too. actually, i changed this .spec

Code: [Select]
%define cvsdate %(date +%Y%m%d)

Name:         aMule
Summary:      aMule - another eMule p2p client
Version:      CVS
Release: %{cvsdate}.%{suserel}
License:      GPL
Group:        Applications/Internet/P2P
Source: aMule-%{version}-%{cvsdate}.tar.bz2
BuildRoot:    %{_builddir}/%{name}-%{version}-root
Packager:     ihmselbst
Distribution: SUSE 10.0 (i586)
Prefix:       /usr
Url:          [URL]http://www.amule.org[/URL]
Vendor:       The aMule Team ([URL]http://forum.amule.org/[/URL])
Provides:     %{name}

%description
aMule is a peer to peer file sharing client, based on the well known eMule.\nStarting with 2.0.0 aMule works on Linux, Mac, *BSD and Windows, which makes it the first multi-platform edonkey network client.

%pre
echo "************************************************************************************"
echo "Warning: This is a cvs release!"
echo "This release is made for testing purpose and it may cause several problems,"
echo "burn your house, kill your dog, etc, but it *should* be safe to use anyway."
echo "If you would like to test some of the great new features go on and install."
echo "Otherwise you may press ctrl-c within the next 15 seconds to abort the installation."
echo "This version reguires wxGTK-2.6.1.0-4 from your SuSE-10.0-installmedia."
echo "You can also apt-get install it, or download it from"
echo "http://ftp.opensuse.org/pub/opensuse/distribution/SL-10.0-OSS/inst-source/suse/i586/"
echo -n "Waiting for user... "
for i in $(seq 15 -1 1); do
    echo -n "$i, "
    sleep 1
done
echo " 0, ok, here we go then... Muhahaha :), installing."

%prep
rm -rf $RPM_BUILD_ROOT
mkdir $RPM_BUILD_ROOT

#%setup -q
%setup -q -n amule-cvs


%build
CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" \
./configure --prefix=%{prefix} --enable-kad-compile --enable-debug --enable-cas --enable-wxcas --enable-amuleweb --enable-amulecmd --enable-webserver --enable-webservergui --enable-alc --enable-alcc --enable-ccache --disable-optimize
make -j 2

%install
make DESTDIR=$RPM_BUILD_ROOT install-strip

cd $RPM_BUILD_ROOT

%clean
rm -rf $RPM_BUILD_ROOT
rm -rf $RPM_BUILD_DIR/file.list.%{name}
rm -rf $RPM_BUILD_DIR/file.list.%{name}.libs
rm -rf $RPM_BUILD_DIR/file.list.%{name}.files
rm -rf $RPM_BUILD_DIR/file.list.%{name}.files.tmp
rm -rf $RPM_BUILD_DIR/file.list.%{name}.dirs

%files

%defattr(-,root,root,0755)
%{_bindir}/amule
%{_bindir}/ed2k
%{_bindir}/amulecmd
%{_bindir}/alc
%{_bindir}/alcc
%{_bindir}/cas
%{_bindir}/wxcas
%{_bindir}/amuleweb
%{_libdir}/xchat/plugins/xas.pl
%{_datadir}/applications/*
%{_datadir}/locale/*
%{_datadir}/pixmaps/*
%{_prefix}/man/*/*
#%dir %{_datadir}/doc/%{name}-%{version}
#%doc %{_datadir}/doc/%{name}-%{version}/*
%dir %{_datadir}/doc/aMule-CVS
%doc %{_datadir}/doc/aMule-CVS/*
%dir %{_datadir}/cas
%{_datadir}/cas/*
%dir %{_datadir}/amule
%dir %{_datadir}/amule/webserver
%{_datadir}/amule/webserver/*


%changelog
* Mon Apr 19 2005 Marcelo Jimenez
- Removed curl dependency, aMule now uses wxHTTP.

* Mon Mar 26 2005 Marcelo Jimenez
- Added a distro test, so we know the distro.
- Tests for UTF-8 enabled LANG to use UTF-8 systray.

* Mon Mar 21 2005 Marcelo Jimenez
- Removed krb5-libs require and krb5-devel buildprereq. curl-lib and
curl-devel is enough.

* Tue Mar 08 2005 Marcelo Jimenez
- Made it work with cvs snapshots at their very same day.

* Wed Jun 16 2004 Ariano Bertacca
- added tool package.

* Sat May 22 2004 Ariano Bertacca
- added webserver package.

* Sun Mar 28 2004 Ariano Bertacca
- added libcryptopp to dependencies/BuildPreReq
- getting wx-config and wxbase-config from installed rpm to avoid problems
  with people using wxGTK-2.5.
  Idea taken from aMule-2.0.0rc1.spec done by
  deltaHF and
  pure_ascii

* Tue Feb 10 2004 Ariano Bertacca
- modified the BuildPreReq to satisfy amulecmd build requirements.

* Sat Jan 23 2004 Ariano Bertacca
- initial amule.spec release

to this one:
Code: [Select]
%define cvsdate %(date +%Y%m%d)

Name:         aMule
Summary:      aMule - another eMule p2p client
Version:      CVS
Release: %{cvsdate}.%{suserel}
License:      GPL
Group:        Applications/Internet/P2P
Source: aMule-%{version}-%{cvsdate}.tar.bz2
BuildRoot:    %{_builddir}/%{name}-%{version}-root
Packager:     ihmselbst
Distribution: SUSE 10.0 (i586)
%define prefix /usr
Url:          [URL]http://www.amule.org[/URL]
Vendor:       The aMule Team ([URL]http://forum.amule.org/[/URL])

%description
aMule is a peer to peer file sharing client, based on the well known eMule.
Starting with 2.0.0 aMule works on Linux, Mac, *BSD and Windows, which makes it the first multi-platform edonkey network client.

%pre
echo "************************************************************************************"
echo "Warning: This is a cvs release!"
echo "This release is made for testing purpose and it may cause several problems,"
echo "burn your house, kill your dog, etc, but it *should* be safe to use anyway."
echo "If you would like to test some of the great new features go on and install."
echo "Otherwise you may press ctrl-c within the next 15 seconds to abort the installation."
echo "This version requires wxGTK-2.6.1.0-4 from your SuSE-10.0-installmedia."
echo "You can also apt-get install it, or download it from"
echo "http://ftp.opensuse.org/pub/opensuse/distribution/SL-10.0-OSS/inst-source/suse/i586/"
echo -n "Waiting for user... "
for i in $(seq 15 -1 1); do
    echo -n "$i, "
    sleep 1
done
echo " 0, ok, here we go then... Muhahaha :), installing."

%prep
#rm -rf $RPM_BUILD_ROOT
#mkdir $RPM_BUILD_ROOT

%setup -q -n amule-cvs


%build
CFLAGS="-Os" \
CXXFLAGS="-Os" \
./configure --prefix=%{prefix} --enable-debug --enable-cas --enable-wxcas --enable-amuleweb --enable-amulecmd --enable-webserver --enable-webservergui --enable-alc --enable-alcc --enable-ccache --disable-optimize --libdir=%{_libdir} --mandir=%{_mandir}
make -j 2

%install
make DESTDIR=$RPM_BUILD_ROOT install-strip \
   docdir=%{_defaultdocdir}/%{name}

%clean
rm -rf $RPM_BUILD_ROOT

%files

%defattr(-,root,root,0755)
%{_bindir}/amule
%{_bindir}/ed2k
%{_bindir}/amulecmd
%{_bindir}/alc
%{_bindir}/alcc
%{_bindir}/cas
%{_bindir}/wxcas
%{_bindir}/amuleweb
%{_libdir}/xchat/plugins/xas.pl
%{_datadir}/applications/*
%{_datadir}/locale/*
%{_datadir}/pixmaps/*
%{_mandir}/*/*
%{_defaultdocdir}/%{name}
%dir %{_datadir}/cas
%{_datadir}/cas/*
%dir %{_datadir}/amule
%dir %{_datadir}/amule/webserver
%{_datadir}/amule/webserver/*


%changelog
* Mon Apr 19 2005 Marcelo Jimenez
- Removed curl dependency, aMule now uses wxHTTP.

* Mon Mar 26 2005 Marcelo Jimenez
- Added a distro test, so we know the distro.
- Tests for UTF-8 enabled LANG to use UTF-8 systray.

* Mon Mar 21 2005 Marcelo Jimenez
- Removed krb5-libs require and krb5-devel buildprereq. curl-lib and
curl-devel is enough.

* Tue Mar 08 2005 Marcelo Jimenez
- Made it work with cvs snapshots at their very same day.

* Wed Jun 16 2004 Ariano Bertacca
- added tool package.

* Sat May 22 2004 Ariano Bertacca
- added webserver package.

* Sun Mar 28 2004 Ariano Bertacca
- added libcryptopp to dependencies/BuildPreReq
- getting wx-config and wxbase-config from installed rpm to avoid problems
  with people using wxGTK-2.5.
  Idea taken from aMule-2.0.0rc1.spec done by
  deltaHF and
  pure_ascii

* Tue Feb 10 2004 Ariano Bertacca
- modified the BuildPreReq to satisfy amulecmd build requirements.

* Sat Jan 23 2004 Ariano Bertacca
- initial amule.spec release

will leave away the --optimize for the next trial run now.

btw:
the changes in the version, Ryanlee talked about in the initialposting (rpm about 1M bigger), additionally only contained the daemonthings
--enable-amule-daemon

and
%{_bindir}/amuled


cu


confirming:
without the --disable-optimize, the created rpm is about 80k smaller. 8)

btw:
additionally, i found some stuff about rpms, specs and its "suse-conformity". - if someone is interested:
SUSE Package Conventions


cu



strange, seems as if todays SuSE10.0-build resists the deleted --disable-optimize, while yesterday´s became a bit smaller. it stays persistent at about 3MB, compared to yesterdays approximately 2.9M.
will check out this after work tonite (or tomorrow morning). - must leave now, to join the "rl"...


cu
« Last Edit: December 14, 2005, 06:23:32 AM by IhmSelbst »
Logged

Gerd78

  • Hero Member
  • *****
  • Karma: 9
  • Offline Offline
  • Posts: 681
Re: Something big new in today's cvs?
« Reply #17 on: December 14, 2005, 10:18:35 AM »

To avoid confusion:

$RPM_OPT_FLAGS + --enable-optimize = -O2 + -O2 = -O2 (because adding the same option twice is the same as adding it once)

$RPM_OPT_FLAGS + --disable-optimize = -O2 = same as above

no $RPM_OPT_FLAGS + --enable-optimize = -O2 = same as above

no $RPM_OPT_FLAGS + --disable-optimize = no optimization at all

-Os + --enable-optimize = -Os + -O2 = unknown (I don't know the result of adding contradicting options, maybe the first one wins, maybe the latter one)

-Os + --disable-optimize = -Os = optimization for small code size

If all this optimization stuff doesn't look too promising to you, then use a reasonable default - either $RPM_OPT_FLAGS or --enable-optimize, but not both. Optimization is very dependent on the compiler version, something that gives a real advantage with GCC 3.3 (SuSE 9.3) doesn't necessarily do the same with GCC 4.0 (SuSE 10.0). None of them will probably break anything, but maybe -Os reduces code size on one of them and do nothing on the other one.
Logged

Gerd78

  • Hero Member
  • *****
  • Karma: 9
  • Offline Offline
  • Posts: 681
Re: Something big new in today's cvs?
« Reply #18 on: December 17, 2005, 11:17:46 AM »

If you have space problems on your webserver, may I ask what this "libpng-config" package is? aMule works fine with the default libpng + libpng-devel.

And why do you have multiple wxGTK packages? aMule needs only one. If you have two because you have rebuilt SuSE's src.rpm: They do that because some wx applications are written improperly and don't work with unicode-enabled wx libraries ("wxGTK" is the unicode-enabled one and "wxGTK-compat" is the non-unicode one), but that's not the case for aMule, so you can remove one of them and save a lot of space.
Logged

IhmSelbst

  • Full Member
  • ***
  • Karma: 3
  • Offline Offline
  • Posts: 220
    • http://www.ed2k-serverboard.de/
Re: Something big new in today's cvs?
« Reply #19 on: December 19, 2005, 06:29:24 AM »

Quote
Originally posted by Gerd78
To avoid confusion
here, b4 xmas, and avoiding confusion... - for me, this a descrepancy somehow here for several reasons. these days, it´s most stress pure, and nearly _no_ time. ;(

Quote
Originally posted by Gerd78
If you have space problems on your webserver, may I ask what this "libpng-config" package is? aMule works fine with the default libpng + libpng-devel.

of course, u may ask.
hey, libpng-config isn´t under the amule-directory. - DVDstyler, located in the same dir, isn´t used by amule as well, i think. ;)
but, you are right, meanwhile, i should surely remove most uploaded packages.
(and pse don´t ask me, what it once was needed for. there surely was some reason to up it, but which, i can´t remember anymore.)

Quote
Originally posted by Gerd78
And why do you have multiple wxGTK packages? aMule needs only one. If you have two because you have rebuilt SuSE's src.rpm: They do that because some wx applications are written improperly and don't work with unicode-enabled wx libraries ("wxGTK" is the unicode-enabled one and "wxGTK-compat" is the non-unicode one), but that's not the case for aMule, so you can remove one of them and save a lot of space.
ahum. - my fu**ing forgetfulness. - i rebuilt the SuSE10.0-wxthings for testing purpose some day, but the amules, built with it, most crashed, and so, i dropped it again. - and simply forgot to delete the wxthings from webspace. (as usual... sigh)

note:
serverboard once was not founded as some kind of downloadsite, but to offer some support for "Diesel´s Lugdunix Image" (a cd-image for win-users, containing a Mandrake9- or SuSE8.0/8.1-image of a presetted linuxbox with router and some stuff, but primary intended to be used as an eDonkeyserver. - on those days, u could run an eD2k-server on a usual standard-dsl-line without problems, but most ppl. were unable to setup a linux-system. maybe, u rememember, there was only one big server, Adanet, and lots of little dsl-servers. lateron SilentBob and other big servers appeared, the network increased, and the little dsl-servers died, because their lines were bombed with traffic.)
be that as it may, ok, serverboard, as once founded, (nearly) died with the disappearing dsl-servers, also as TDN did, but the _space_ still exists. so, i use it for the comunity.


cu

Gerd78

  • Hero Member
  • *****
  • Karma: 9
  • Offline Offline
  • Posts: 681
Re: Something big new in today's cvs?
« Reply #20 on: December 19, 2005, 07:18:35 AM »

Quote
Originally posted by IhmSelbst
of course, u may ask.
hey, libpng-config isn´t under the amule-directory. - DVDstyler, located in the same dir, isn´t used by amule as well, i think. ;)
but, you are right, meanwhile, i should surely remove most uploaded packages.
(and pse don´t ask me, what it once was needed for. there surely was some reason to up it, but which, i can´t remember anymore.)
I know why it's there and you can believe me: It's *really* old stuff and it's definitely no longer needed. ;)

Let me explain: aMule links to libpng and gets the correct linker flags from the output of the libpng-config script. Try this:
Code: [Select]
libpng-config --ldflagsThe problem was that several years ago, some binary RPMs were lacking this script. But this is not a problem anymore for two reasons:

- SuSE's RPMs have libpng-config:

http://rpm.pbone.net/index.php3/stat/4/idpl/2026229/com/libpng-devel-1.2.8-3.i586.rpm.html

- aMule doesn't need libpng-config any more, it has a different approach for old setups without libpng-config.

So you only need to install SuSE's libpng-devel package, the libpng-config script is there. Currently you probably have it twice. Try this:
Code: [Select]
ls -l /usr/bin/libpng-config
ls -l /usr/local/bin/libpng-config
Quote
Originally posted by IhmSelbst
ahum. - my fu**ing forgetfulness. - i rebuilt the SuSE10.0-wxthings for testing purpose some day, but the amules, built with it, most crashed, and so, i dropped it again. - and simply forgot to delete the wxthings from webspace. (as usual... sigh)
They are maybe needed for SuSE 9.3 (because SuSE 9.3 comes with wx 2.5.3 which is too old for aMule), but not for SuSE 10.0 (SuSE 10.0 comes with a working wx 2.6.1 package).
Logged
Pages: 1 [2]