diff --git a/.gitignore b/.gitignore index 5104f33..2585791 100644 --- a/.gitignore +++ b/.gitignore @@ -34,4 +34,6 @@ inc/ /MANIFEST.bak /pm_to_blib /*.zip - +/*.xz +/*.rpm +/results/ diff --git a/README.md b/README.md index 7fe92d8..9b1ec97 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # smeserver-xt_geoip -smeserver-xt_geoip - -from cvs koozali.org ( T E S T ) \ No newline at end of file +from cvs koozali.org ( T E S T ) + +remove all about patches from smeserver-xt_geoip.spec file +rename directory source to package-version +change gitignore adding all work and built files +local git-mock to build \ No newline at end of file diff --git a/source/COPYING b/smeserver-xt_geoip-1.3.1/COPYING similarity index 100% rename from source/COPYING rename to smeserver-xt_geoip-1.3.1/COPYING diff --git a/source/README b/smeserver-xt_geoip-1.3.1/README similarity index 100% rename from source/README rename to smeserver-xt_geoip-1.3.1/README diff --git a/source/createlinks b/smeserver-xt_geoip-1.3.1/createlinks similarity index 100% rename from source/createlinks rename to smeserver-xt_geoip-1.3.1/createlinks diff --git a/source/root/etc/e-smith/db/configuration/defaults/masq/BadCountries b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/db/configuration/defaults/masq/BadCountries similarity index 100% rename from source/root/etc/e-smith/db/configuration/defaults/masq/BadCountries rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/db/configuration/defaults/masq/BadCountries diff --git a/source/root/etc/e-smith/db/configuration/defaults/masq/GeoIP b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/db/configuration/defaults/masq/GeoIP similarity index 100% rename from source/root/etc/e-smith/db/configuration/defaults/masq/GeoIP rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/db/configuration/defaults/masq/GeoIP diff --git a/source/root/etc/e-smith/db/configuration/defaults/masq/XtServices b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/db/configuration/defaults/masq/XtServices similarity index 100% rename from source/root/etc/e-smith/db/configuration/defaults/masq/XtServices rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/db/configuration/defaults/masq/XtServices diff --git a/source/root/etc/e-smith/db/configuration/migrate/20xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/db/configuration/migrate/20xt_geoip similarity index 100% rename from source/root/etc/e-smith/db/configuration/migrate/20xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/db/configuration/migrate/20xt_geoip diff --git a/source/root/etc/e-smith/events/actions/smeserver-xt_geoip-download-action b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/events/actions/smeserver-xt_geoip-download-action similarity index 100% rename from source/root/etc/e-smith/events/actions/smeserver-xt_geoip-download-action rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/events/actions/smeserver-xt_geoip-download-action diff --git a/source/root/etc/e-smith/events/xt_geoip-modify/templates2expand/etc/rc.d/init.d/masq b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/events/xt_geoip-modify/templates2expand/etc/rc.d/init.d/masq similarity index 100% rename from source/root/etc/e-smith/events/xt_geoip-modify/templates2expand/etc/rc.d/init.d/masq rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/events/xt_geoip-modify/templates2expand/etc/rc.d/init.d/masq diff --git a/source/root/etc/e-smith/events/xt_geoip-update/templates2expand/etc/rc.d/init.d/masq b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/events/xt_geoip-update/templates2expand/etc/rc.d/init.d/masq similarity index 100% rename from source/root/etc/e-smith/events/xt_geoip-update/templates2expand/etc/rc.d/init.d/masq rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/events/xt_geoip-update/templates2expand/etc/rc.d/init.d/masq diff --git a/source/root/etc/e-smith/locale/bg/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/bg/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/bg/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/bg/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/da/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/da/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/da/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/da/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/de/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/de/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/de/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/de/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/el/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/el/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/el/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/el/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/es/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/es/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/es/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/es/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/et/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/et/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/et/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/et/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/fr/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/he/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/he/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/he/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/he/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/hu/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/hu/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/hu/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/hu/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/id/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/id/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/id/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/id/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/it/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/it/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/it/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/it/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/ja/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/ja/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/ja/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/ja/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/nb/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/nb/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/nb/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/nb/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/nl/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/nl/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/nl/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/nl/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/pl/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/pt-br/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/pt/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/pt/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/pt/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/pt/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/ro/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/ro/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/ro/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/ro/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/ru/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/ru/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/ru/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/ru/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/sl/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/sl/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/sl/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/sl/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/sv/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/th/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/th/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/th/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/th/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/tr/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/tr/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/tr/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/tr/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/zh-cn/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/locale/zh-tw/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/zh-tw/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/locale/zh-tw/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/locale/zh-tw/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/etc/e-smith/templates/etc/crontab/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/templates/etc/crontab/xt_geoip similarity index 100% rename from source/root/etc/e-smith/templates/etc/crontab/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/templates/etc/crontab/xt_geoip diff --git a/source/root/etc/e-smith/templates/etc/rc.d/init.d/masq/40Xt_Geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/templates/etc/rc.d/init.d/masq/40Xt_Geoip similarity index 100% rename from source/root/etc/e-smith/templates/etc/rc.d/init.d/masq/40Xt_Geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/templates/etc/rc.d/init.d/masq/40Xt_Geoip diff --git a/source/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90adjustXt_Geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90adjustXt_Geoip similarity index 100% rename from source/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90adjustXt_Geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/templates/etc/rc.d/init.d/masq/90adjustXt_Geoip diff --git a/source/root/etc/e-smith/web/functions/xt_geoip b/smeserver-xt_geoip-1.3.1/root/etc/e-smith/web/functions/xt_geoip similarity index 100% rename from source/root/etc/e-smith/web/functions/xt_geoip rename to smeserver-xt_geoip-1.3.1/root/etc/e-smith/web/functions/xt_geoip diff --git a/source/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm b/smeserver-xt_geoip-1.3.1/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm similarity index 100% rename from source/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm rename to smeserver-xt_geoip-1.3.1/root/usr/share/perl5/vendor_perl/esmith/FormMagick/Panel/xt_geoip.pm diff --git a/source/root/usr/share/smanager/lib/SrvMngr/Controller/Xt_geoip.pm b/smeserver-xt_geoip-1.3.1/root/usr/share/smanager/lib/SrvMngr/Controller/Xt_geoip.pm similarity index 100% rename from source/root/usr/share/smanager/lib/SrvMngr/Controller/Xt_geoip.pm rename to smeserver-xt_geoip-1.3.1/root/usr/share/smanager/lib/SrvMngr/Controller/Xt_geoip.pm diff --git a/source/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Xt_geoip/xt_geoip_en.lex b/smeserver-xt_geoip-1.3.1/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Xt_geoip/xt_geoip_en.lex similarity index 100% rename from source/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Xt_geoip/xt_geoip_en.lex rename to smeserver-xt_geoip-1.3.1/root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Xt_geoip/xt_geoip_en.lex diff --git a/source/root/usr/share/smanager/themes/default/templates/partials/_xtg_lcodes.html.ep b/smeserver-xt_geoip-1.3.1/root/usr/share/smanager/themes/default/templates/partials/_xtg_lcodes.html.ep similarity index 100% rename from source/root/usr/share/smanager/themes/default/templates/partials/_xtg_lcodes.html.ep rename to smeserver-xt_geoip-1.3.1/root/usr/share/smanager/themes/default/templates/partials/_xtg_lcodes.html.ep diff --git a/source/root/usr/share/smanager/themes/default/templates/partials/_xtg_services.html.ep b/smeserver-xt_geoip-1.3.1/root/usr/share/smanager/themes/default/templates/partials/_xtg_services.html.ep similarity index 100% rename from source/root/usr/share/smanager/themes/default/templates/partials/_xtg_services.html.ep rename to smeserver-xt_geoip-1.3.1/root/usr/share/smanager/themes/default/templates/partials/_xtg_services.html.ep diff --git a/source/root/usr/share/smanager/themes/default/templates/partials/_xtg_stats.html.ep b/smeserver-xt_geoip-1.3.1/root/usr/share/smanager/themes/default/templates/partials/_xtg_stats.html.ep similarity index 100% rename from source/root/usr/share/smanager/themes/default/templates/partials/_xtg_stats.html.ep rename to smeserver-xt_geoip-1.3.1/root/usr/share/smanager/themes/default/templates/partials/_xtg_stats.html.ep diff --git a/source/root/usr/share/smanager/themes/default/templates/xt_geoip.html.ep b/smeserver-xt_geoip-1.3.1/root/usr/share/smanager/themes/default/templates/xt_geoip.html.ep similarity index 100% rename from source/root/usr/share/smanager/themes/default/templates/xt_geoip.html.ep rename to smeserver-xt_geoip-1.3.1/root/usr/share/smanager/themes/default/templates/xt_geoip.html.ep diff --git a/source/root/usr/share/smanager/themes/default/templates/xt_geoip_lsrv.html.ep b/smeserver-xt_geoip-1.3.1/root/usr/share/smanager/themes/default/templates/xt_geoip_lsrv.html.ep similarity index 100% rename from source/root/usr/share/smanager/themes/default/templates/xt_geoip_lsrv.html.ep rename to smeserver-xt_geoip-1.3.1/root/usr/share/smanager/themes/default/templates/xt_geoip_lsrv.html.ep diff --git a/source/root/usr/share/smanager/themes/default/templates/xt_geoip_lst.html.ep b/smeserver-xt_geoip-1.3.1/root/usr/share/smanager/themes/default/templates/xt_geoip_lst.html.ep similarity index 100% rename from source/root/usr/share/smanager/themes/default/templates/xt_geoip_lst.html.ep rename to smeserver-xt_geoip-1.3.1/root/usr/share/smanager/themes/default/templates/xt_geoip_lst.html.ep diff --git a/source/root/usr/share/smanager/themes/default/templates/xt_geoip_rems.html.ep b/smeserver-xt_geoip-1.3.1/root/usr/share/smanager/themes/default/templates/xt_geoip_rems.html.ep similarity index 100% rename from source/root/usr/share/smanager/themes/default/templates/xt_geoip_rems.html.ep rename to smeserver-xt_geoip-1.3.1/root/usr/share/smanager/themes/default/templates/xt_geoip_rems.html.ep diff --git a/source/root/usr/share/smanager/themes/default/templates/xt_geoip_upds.html.ep b/smeserver-xt_geoip-1.3.1/root/usr/share/smanager/themes/default/templates/xt_geoip_upds.html.ep similarity index 100% rename from source/root/usr/share/smanager/themes/default/templates/xt_geoip_upds.html.ep rename to smeserver-xt_geoip-1.3.1/root/usr/share/smanager/themes/default/templates/xt_geoip_upds.html.ep diff --git a/source/root/usr/share/smanager/themes/default/templates/xt_geoip_updt.html.ep b/smeserver-xt_geoip-1.3.1/root/usr/share/smanager/themes/default/templates/xt_geoip_updt.html.ep similarity index 100% rename from source/root/usr/share/smanager/themes/default/templates/xt_geoip_updt.html.ep rename to smeserver-xt_geoip-1.3.1/root/usr/share/smanager/themes/default/templates/xt_geoip_updt.html.ep diff --git a/source/root/usr/share/xt_geoip/geoip_countries_list.txt b/smeserver-xt_geoip-1.3.1/root/usr/share/xt_geoip/geoip_countries_list.txt similarity index 100% rename from source/root/usr/share/xt_geoip/geoip_countries_list.txt rename to smeserver-xt_geoip-1.3.1/root/usr/share/xt_geoip/geoip_countries_list.txt diff --git a/source/root/usr/share/xt_geoip/geoip_exstat b/smeserver-xt_geoip-1.3.1/root/usr/share/xt_geoip/geoip_exstat similarity index 100% rename from source/root/usr/share/xt_geoip/geoip_exstat rename to smeserver-xt_geoip-1.3.1/root/usr/share/xt_geoip/geoip_exstat diff --git a/source/root/usr/share/xt_geoip/geoip_listat b/smeserver-xt_geoip-1.3.1/root/usr/share/xt_geoip/geoip_listat similarity index 100% rename from source/root/usr/share/xt_geoip/geoip_listat rename to smeserver-xt_geoip-1.3.1/root/usr/share/xt_geoip/geoip_listat diff --git a/source/root/usr/share/xt_geoip/geoip_look b/smeserver-xt_geoip-1.3.1/root/usr/share/xt_geoip/geoip_look similarity index 100% rename from source/root/usr/share/xt_geoip/geoip_look rename to smeserver-xt_geoip-1.3.1/root/usr/share/xt_geoip/geoip_look diff --git a/source/root/usr/share/xt_geoip/geoip_stats b/smeserver-xt_geoip-1.3.1/root/usr/share/xt_geoip/geoip_stats similarity index 100% rename from source/root/usr/share/xt_geoip/geoip_stats rename to smeserver-xt_geoip-1.3.1/root/usr/share/xt_geoip/geoip_stats diff --git a/source/root/usr/share/xt_geoip/update_base b/smeserver-xt_geoip-1.3.1/root/usr/share/xt_geoip/update_base similarity index 100% rename from source/root/usr/share/xt_geoip/update_base rename to smeserver-xt_geoip-1.3.1/root/usr/share/xt_geoip/update_base diff --git a/source/root/usr/share/xt_geoip/xt_geoip_dl b/smeserver-xt_geoip-1.3.1/root/usr/share/xt_geoip/xt_geoip_dl similarity index 100% rename from source/root/usr/share/xt_geoip/xt_geoip_dl rename to smeserver-xt_geoip-1.3.1/root/usr/share/xt_geoip/xt_geoip_dl diff --git a/source/root/var/lib/xt_geoip/README.txt b/smeserver-xt_geoip-1.3.1/root/var/lib/xt_geoip/README.txt similarity index 100% rename from source/root/var/lib/xt_geoip/README.txt rename to smeserver-xt_geoip-1.3.1/root/var/lib/xt_geoip/README.txt diff --git a/smeserver-xt_geoip.spec b/smeserver-xt_geoip.spec index 03e2d7d..e3e6652 100644 --- a/smeserver-xt_geoip.spec +++ b/smeserver-xt_geoip.spec @@ -1,6 +1,6 @@ %define name smeserver-xt_geoip %define version 1.3.1 -%define release 18 +%define release 19 Summary: smserver rpm to setup database, update and configuration for xt_geoip module with a panel. Name: %{name} @@ -10,21 +10,6 @@ License: GNU GPL version 2 URL: http://wiki.contribs.org/Main_Page Group: SMEserver/addon Source: %{name}-%{version}.tar.xz -Patch0: %{name}-%{version}-comp_e-smith-manager.patch -Patch1: %{name}-%{version}-update_base.patch -Patch2: smeserver-xt_geoip-1.3.1-update-event-oldManager.patch -Patch3: %{name}-%{version}-logfiles_changes.patch -Patch4: smeserver-xt_geoip-1.3.1-locale-2021-08-25.patch -Patch5: smeserver-xt_geoip-1.3.1-locale-2021-09-23.patch -Patch6: smeserver-xt_geoip-1.3.1-locale-2021-10-28.patch -Patch7: smeserver-xt_geoip-1.3.1-SME_11676.patch -Patch8: smeserver-xt_geoip-1.3.1-Add-class-to-div-for-AdminLTE.patch -Patch9: smeserver-xt_geoip-1.3.1-SME_11887.patch -Patch10: smeserver-xt_geoip-1.3.1-bz12029_backup-bz10863_bases.patch -Patch11: smeserver-xt_geoip-1.3.1-bz12097_fix_logs_date_test.patch -Patch12: smeserver-xt_geoip-1.3.1-bz12098_add_fail2ban_stats.patch -Patch13: smeserver-xt_geoip-1.3.1-locale-2022-11-11.patch -Patch14: smeserver-xt_geoip-1.3.1-bz12291_module_state.patch BuildArchitectures: noarch BuildRoot: /var/tmp/%{name}-%{version} @@ -45,31 +30,10 @@ smserver rpm to setup database, update and configuration for xt_geoip module wit %prep %setup -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -# tmp fix before new source archive -rm -rf root/etc/e-smith/events/bootstrap-console-save/templates2expand -rm -rf root/etc/e-smith/events/console-save/templates2expand -rm -rf root/etc/e-smith/events/xt_geoip-modify/templates2expand/usr -rm -rf root/etc/e-smith/events/xt_geoip-update/templates2expand/usr -%patch7 -p1 -%patch8 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p1 %build perl createlinks - %install rm -rf $RPM_BUILD_ROOT @@ -103,6 +67,9 @@ rm -rf %{name}-%{version} %changelog +* Wed Feb 08 2023 Michel Begue 1.3.1-19.sme +- no patch infos here in .spec ( F A K E ) [SME: ] + * Wed Jan 11 2023 Michel Begue 1.3.1-18.sme - add a message if module xt_geoip is missing or not loaded [SME: 12291] - add a message if chain XTGeoIP is missing (iptables) [SME: 12291]