-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Il 05/01/2012 16:38, Jani Välimaa ha scritto: > 2012/1/5 <[email protected]>: >> Revision 191611 Author matteo Date 2012-01-05 16:10:45 +0100 (Thu, 05 Jan >> 2012) >> >> Log Message >> >> - new sources >> - switched antico launcher icon with mageia icon >> >> Modified Paths >> >> cauldron/antico/current/SPECS/antico.spec >> >> Modified: cauldron/antico/current/SPECS/antico.spec >> =================================================================== >> --- cauldron/antico/current/SPECS/antico.spec 2012-01-05 15:10:00 UTC >> (rev >> 191610) >> +++ cauldron/antico/current/SPECS/antico.spec 2012-01-05 15:10:45 UTC >> (rev >> 191611) >> @@ -1,13 +1,16 @@ >> -%define git 33b232a >> +#define git 33b232a >> +%define git 74aa84c >> >> Name: antico >> Version: 0.2 >> -Release: %mkrel -c git 1 >> +Release: %mkrel -c git 2 >> Summary: Antico Desktop/Window Manager >> License: GPLv2 >> Url: http://www.giuseppecigala.it/Antico.html >> #Source0: https://github.com/antico/antico/tarball/master >> -Source: %{name}-%{name}-%{git}.tar.gz >> +Source: pasmatt-%{name}-%{git}.zip >> +#Source: %{name}-%{name}-%{git}.tar.gz >> +Patch0: %{name}-mageia_icon.patch >> Group: Graphical desktop/Other >> >> BuildRequires: qt4-devel >> @@ -23,17 +26,20 @@ >> without any other external dependencies. >> >> %prep >> -%setup -q -n %{name}-%{name}-%{git} >> +%setup -q -n pasmatt-%{name}-%{git} >> +%apply_patches >> >> # patch to make antico more modular >> -find . -name "*.cpp" -type f -exec sed -i -e >> 's|QCoreApplication::applicationDirPath()[[:space:]]+[[:space:]]"/antico.cfg"|QDir::homePath() >> + "/.antico.cfg"|g' {} \; >> -find . -name "*.cpp" -type f -exec sed -i -e >> 's|QCoreApplication::applicationDirPath()[[:space:]]+[[:space:]]"/theme|QDir::rootPath() >> + "usr/share/antico/theme|g' {} \; >> -find . -name "*.cpp" -type f -exec sed -i -e >> 's|QCoreApplication::applicationDirPath()[[:space:]]+[[:space:]]"/language|QDir::rootPath() >> + "usr/share/antico/language|g' {} \; >> +# fixed upstream (pasmatt fork on github) >> +#find . -name "*.cpp" -type f -exec sed -i -e >> 's|QCoreApplication::applicationDirPath()[[:space:]]+[[:space:]]"/antico.cfg"|QDir::homePath() >> + "/.antico.cfg"|g' {} \; >> +#find . -name "*.cpp" -type f -exec sed -i -e >> 's|QCoreApplication::applicationDirPath()[[:space:]]+[[:space:]]"/theme|QDir::rootPath() >> + "usr/share/antico/theme|g' {} \; >> +#find . -name "*.cpp" -type f -exec sed -i -e >> 's|QCoreApplication::applicationDirPath()[[:space:]]+[[:space:]]"/language|QDir::rootPath() >> + "usr/share/antico/language|g' {} \; >> >> %build >> %{qmake_qt4} >> -# workaround to allow compilation on mga2 (why?) >> -%make SUBLIBS="-lXext -lX11" >> +# FIXED - workaround to allow compilation on mga2 (why?) >> +#%make SUBLIBS="-lXext -lX11" >> +%make >> >> %install >> %__rm -fr %{buildroot} >> > > Please remove old, obsoleted and not needed parts of .spec instead of > commenting them out. IMHO there's no need to keep eg. 3 different > source tags in .spec. Changes can be restored and reverted from svn > afterwards if needed. Yes, you're right. I'll clean this spec asap. Thank you. - -- Matteo -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) Comment: Using GnuPG with Mageia - http://enigmail.mozdev.org/
iQEcBAEBAgAGBQJPBfwJAAoJED3LowjDDWbN7zwH/Ax0YYijiwcgHysc4YV8GQT7 Eb9IRRBDs56z8ZXnvG4scjBMEx3BdpeCFY9Mx5rtsuaV/YQzKb0oDwnsnI/TOsXO RRSVNbUCn2sjWv+wUNK+YSypOYohiQOaK/wf0eRp+NiSAdz+shbaygSlAAInEdGz 7ZS3XxjxfTldNex2TC4YbqscnoyIpsQRvVClIiyK36pMPbSBLNZY8pb80uFnlyHv wk5ye3jHsKeZtL/SPncShlUnF1KJPHXs49FiNY1RHf603gGZ1CNax4c2H8hyS3kO G+QBzOICHH/IJpgTUiJzsrHbEN7IOfvQwGYP6aJwSX93eZ+Lls2iaBZT5z6zyqk= =CveC -----END PGP SIGNATURE-----
